Fix MSVC build errors and warnings

rafalh · Dec 4, 2019 · 06261e9 · 06261e9
1 parent eb5db37
commit 06261e9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/game_patch/graphics/graphics.cpp b/game_patch/graphics/graphics.cpp
@@ -178,7 +178,7 @@ CodeInjection setup_stretched_window_patch{
             SetWindowLongA(rf::main_wnd, GWL_STYLE, WS_POPUP | WS_SYSMENU);
             SetWindowLongA(rf::main_wnd, GWL_EXSTYLE, 0);
             SetWindowPos(rf::main_wnd, HWND_NOTOPMOST, 0, 0, cx, cy, SWP_SHOWWINDOW);
-            rf::gr_screen.aspect = static_cast<double>(cx) / static_cast<double>(cy) * 0.75;
+            rf::gr_screen.aspect = static_cast<float>(cx) / static_cast<float>(cy) * 0.75f;
             regs.eip = 0x0050C551;
         }
     },

diff --git a/game_patch/misc.cpp b/game_patch/misc.cpp
@@ -968,10 +968,10 @@ CodeInjection face_scroll_fix{
         std::byte* scroll_data_vec = geometry + 0x2F4;
         int num = *reinterpret_cast<uint32_t*>(scroll_data_vec);
         void **scroll_data = *reinterpret_cast<void***>(scroll_data_vec + 8);
-        auto RflFaceScroll_SetupFaces = reinterpret_cast<void __thiscall(*)(void* self, void* geometry)>(0x004E60C0);
+        auto RflFaceScroll_SetupFaces = reinterpret_cast<void(__fastcall*)(void* self, void* edx, void* geometry)>(0x004E60C0);
         return;
         for (int i = 0; i < num; ++i) {
-            RflFaceScroll_SetupFaces(scroll_data[i], geometry);
+            RflFaceScroll_SetupFaces(scroll_data[i], nullptr, geometry);
         }
     },
 };

diff --git a/game_patch/purefaction/pf.cpp b/game_patch/purefaction/pf.cpp
@@ -79,7 +79,7 @@ void process_pf_players_request_packet([[ maybe_unused ]] const void* data, [[ m
     auto packet_buf = std::make_unique<std::byte[]>(sizeof(pf_players_packet) + players_str.size());
     auto& response = *reinterpret_cast<pf_players_packet*>(packet_buf.get());
     response.hdr.type = static_cast<u8>(pf_packet_type::players);
-    response.hdr.size = sizeof(pf_players_packet) + players_str.size() - sizeof(rf_packet_header);
+    response.hdr.size = static_cast<u16>(sizeof(pf_players_packet) + players_str.size() - sizeof(rf_packet_header));
     response.version = 1;
     response.show_ip = 0;
     std::copy(players_str.begin(), players_str.end(), reinterpret_cast<char*>(packet_buf.get() + sizeof(pf_players_packet)));

diff --git a/game_patch/rf.h b/game_patch/rf.h
@@ -1894,11 +1894,11 @@ namespace rf
 
     static auto ClearLevelSound = AddrAsRef<int(LevelSound* lvl_snd)>(0x00505680);
     static auto SndStop = AddrAsRef<char(int sig)>(0x005442B0);
-    static auto SndGetDuration = AddrAsRef<double(int game_snd_id)>(0x00544760);
+    static auto SndGetDuration = AddrAsRef<float(int game_snd_id)>(0x00544760);
     static auto SndDsCloseChannel = AddrAsRef<bool(int channel)>(0x00521930);
     static auto SndDsChannelIsPlaying = AddrAsRef<void*(int channel)>(0x005224D0);
     static auto SndDsIsChannelPaused = AddrAsRef<bool(int channel)>(0x00522500);
-    static auto SndDsEstimateDuration = AddrAsRef<double(int snd_buf_id)>(0x00523170);
+    static auto SndDsEstimateDuration = AddrAsRef<float(int snd_buf_id)>(0x00523170);
 
     /* RF stdlib functions are not compatible with GCC */