From f3cafd2bf739f62d24c6aa39b222769c0023d5c9 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Tue, 10 Nov 2026 19:48:03 +0600 Subject: [PATCH] Fixing minor bugs --- proj-windows/CMakeLists.txt | 5 +++++ server/CMakeLists.txt | 5 +++++ src/Location.cpp | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/proj-windows/CMakeLists.txt b/proj-windows/CMakeLists.txt index b044a8c..10f1f1a 100644 --- a/proj-windows/CMakeLists.txt +++ b/proj-windows/CMakeLists.txt @@ -174,6 +174,11 @@ if(WIN32) ../src/game_server/RemoteGameServerHost.h ../src/game_server/RemoteGameServerHost.cpp ) + if(MSVC) + set_source_files_properties( + ../src/game_server/WebsocketGameClient.cpp + PROPERTIES COMPILE_OPTIONS "/bigobj") + endif() target_link_libraries( ShadowOverBishkekDemo PRIVATE opengl32 ws2_32 mswsock) endif() diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 9f9f29a..02de723 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -163,6 +163,11 @@ if(BUILD_TESTING) target_compile_definitions( GameServerWebsocketLockstepTests PRIVATE NETWORK WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0A00) + if(MSVC) + set_source_files_properties( + "${GAME_ROOT}/src/game_server/WebsocketGameClient.cpp" + PROPERTIES COMPILE_OPTIONS "/bigobj") + endif() target_link_libraries( GameServerWebsocketLockstepTests PRIVATE game_server_core ws2_32 mswsock) diff --git a/src/Location.cpp b/src/Location.cpp index adc775d..921b3ea 100644 --- a/src/Location.cpp +++ b/src/Location.cpp @@ -890,11 +890,11 @@ namespace FRG } Character* Location::raycastNpcs(const Eigen::Vector3f& rayOrigin, const Eigen::Vector3f& rayDir, float maxDistance) { - // Every NPC is treated as a vertical cylinder: radius 0.25m, height 1.6m, + // Every NPC is treated as a vertical cylinder // base at npc->position (the model's foot). Intersection = circle hit in the // XZ plane, then clip the entry/exit t against the [yFoot, yFoot+height] slab. - static constexpr float NPC_CLICK_RADIUS = 0.25f; - static constexpr float NPC_CLICK_HEIGHT = 1.6f; + static constexpr float NPC_CLICK_RADIUS = 0.35f; + static constexpr float NPC_CLICK_HEIGHT = 1.8f; static constexpr float NPC_PICK_EPSILON = 1e-6f; Character* closestNpc = nullptr;