Merge branch 'master' into remove_unsigned_int

MHeasell · Aug 26, 2021 · bb67d92 · bb67d92
2 parents 9023b15 + 24c46d0
commit bb67d92
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -171,7 +171,6 @@ else()
     find_windows_dll(MODPLUG_DLL "libmodplug-1.dll")
     find_windows_dll(OPUSFILE_DLL "libopusfile-0.dll")
     find_windows_dll(OPUS_DLL "libopus-0.dll")
-    find_windows_dll(PORTAUDIO_DLL "libportaudio-2.dll")
     find_windows_dll(READLINE_DLL "libreadline8.dll")
     find_windows_dll(SNDFILE_DLL "libsndfile-1.dll")
     find_windows_dll(VORBISENC_DLL "libvorbisenc-2.dll")
@@ -636,7 +635,6 @@ if(WIN32 AND NOT MSVC)
     target_copy_file(librwe ${OPUSFILE_DLL}) # MSYS2 SDL2_mixer depends on opusfile
     target_copy_file(librwe ${SSP_DLL}) # MSYS2 SDL2_mixer libflac depends on ssp
     target_copy_file(librwe ${OPUS_DLL})
-    target_copy_file(librwe ${PORTAUDIO_DLL})
     target_copy_file(librwe ${READLINE_DLL})
     target_copy_file(librwe ${SNDFILE_DLL})
     target_copy_file(librwe ${VORBISENC_DLL})

diff --git a/libs/spdlog b/libs/spdlog
diff --git a/src/main.cpp b/src/main.cpp
@@ -28,7 +28,7 @@
 #include <rwe/ui/UiFactory.h>
 #include <rwe/util.h>
 #include <rwe/vfs/CompositeVirtualFileSystem.h>
-#include <spdlog/spdlog.h>
+#include <spdlog/sinks/basic_file_sink.h>
 
 namespace fs = boost::filesystem;
 namespace po = boost::program_options;

diff --git a/src/rwe/GameNetworkService.cpp b/src/rwe/GameNetworkService.cpp
@@ -8,7 +8,6 @@
 #include <rwe/proto/serialization.h>
 #include <rwe/range_util.h>
 #include <rwe/sim/SimTicksPerSecond.h>
-#include <spdlog/fmt/ostr.h>
 #include <spdlog/spdlog.h>
 #include <thread>
 
@@ -177,7 +176,7 @@ namespace rwe
         sendTimer.async_wait([this](const boost::system::error_code& error) {
             if (error)
             {
-                spdlog::get("rwe")->error("Boost error while waiting on timer: {}", error);
+                spdlog::get("rwe")->error("Boost error while waiting on timer: {}", error.message());
                 return;
             }
 
@@ -231,7 +230,7 @@ namespace rwe
     {
         if (error)
         {
-            spdlog::get("rwe")->error("Boost error on receive: {}", error);
+            spdlog::get("rwe")->error("Boost error on receive: {}", error.message());
             return;
         }
 
@@ -292,8 +291,8 @@ namespace rwe
         {
             spdlog::get("rwe")->error(
                 "Remote acked up to {0}, but we are at {1} and command buffer contains {2} elements",
-                newNextCommandToSend,
-                endpoint.nextCommandToSend,
+                newNextCommandToSend.value,
+                endpoint.nextCommandToSend.value,
                 endpoint.sendBuffer.size());
         }
         while (newNextCommandToSend > endpoint.nextCommandToSend && !endpoint.sendBuffer.empty())
@@ -350,8 +349,8 @@ namespace rwe
         {
             spdlog::get("rwe")->error(
                 "Remote acked up to {0}, but we are at {1} and hash buffer contains {2} elements",
-                newNextHashToSend,
-                endpoint.nextHashToSend,
+                newNextHashToSend.value,
+                endpoint.nextHashToSend.value,
                 endpoint.hashSendBuffer.size());
         }
         while (newNextHashToSend > endpoint.nextHashToSend && !endpoint.hashSendBuffer.empty())

diff --git a/src/rwe/Index.h b/src/rwe/Index.h
@@ -1,3 +1,4 @@
+#pragma once
 #include <cstddef>
 
 namespace rwe