From bf9567a71c7571598253f087bc584b96f21219dc Mon Sep 17 00:00:00 2001
From: tovjemam <tovjemam@deadfish.cz>
Date: Thu, 8 Jan 2026 17:30:26 +0100
Subject: [PATCH] Fix includes and various errors

---
 CMakeLists.txt          | 7 ++-----
 src/net/fixed_str.hpp   | 3 ++-
 src/net/inmessage.hpp   | 3 ++-
 src/net/outmessage.hpp  | 1 +
 src/server/client.hpp   | 1 +
 src/server/wsserver.cpp | 8 ++++----
 src/server/wsserver.hpp | 3 ++-
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d38cd2..e684896 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,7 +128,7 @@ set(BUILD_PYBULLET OFF CACHE BOOL "" FORCE)
 set(BUILD_OPENGL3_DEMOS OFF CACHE BOOL "" FORCE)
 
 add_subdirectory(external/bullet3)
-target_link_libraries(${MAIN_NAME} PRIVATE BulletCollision BulletDynamics LinearMath Bullet3Common)
+target_link_libraries(${MAIN_NAME} PRIVATE BulletDynamics BulletCollision LinearMath Bullet3Common)
 target_include_directories(${MAIN_NAME} PRIVATE "external/bullet3/src")
 
 target_compile_definitions(${MAIN_NAME} PRIVATE CLIENT)
@@ -200,13 +200,10 @@ endif()
     include_directories(${ASIO_INCLUDE_DIR})
 
     add_subdirectory(external/Crow)
-    set(SERVER_SOURCES
-
-    )
 
     set(SERVER_NAME server)
     add_executable(${SERVER_NAME} ${COMMON_SOURCES} ${SERVER_ONLY_SOURCES})
-    target_link_libraries(${SERVER_NAME} PRIVATE Crow glm BulletCollision BulletDynamics LinearMath Bullet3Common)
+    target_link_libraries(${SERVER_NAME} PRIVATE Crow glm BulletDynamics BulletCollision LinearMath Bullet3Common)
     target_include_directories(${SERVER_NAME} PRIVATE "src" "external/bullet3/src")
     target_compile_definitions(${SERVER_NAME} PRIVATE SERVER)
 
diff --git a/src/net/fixed_str.hpp b/src/net/fixed_str.hpp
index 7a615c4..d52ef94 100644
--- a/src/net/fixed_str.hpp
+++ b/src/net/fixed_str.hpp
@@ -4,6 +4,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <string>
+#include <cstring>
 
 namespace net
 {
@@ -40,4 +41,4 @@ template <size_t N>
 using FixedStrLen = std::conditional_t<(N > 255), uint16_t, uint8_t>;
 
 
-} // namespace net
\ No newline at end of file
+} // namespace net
diff --git a/src/net/inmessage.hpp b/src/net/inmessage.hpp
index 17dc251..3781afa 100644
--- a/src/net/inmessage.hpp
+++ b/src/net/inmessage.hpp
@@ -3,6 +3,7 @@
 #include <cstdint>
 #include <concepts>
 #include <stdexcept>
+#include <cstring>
 
 #include "fixed_str.hpp"
 #include "quantized.hpp"
@@ -147,4 +148,4 @@ private:
     const char* end_;
 };
 
-} // namespace net
\ No newline at end of file
+} // namespace net
diff --git a/src/net/outmessage.hpp b/src/net/outmessage.hpp
index 4082414..29b49b4 100644
--- a/src/net/outmessage.hpp
+++ b/src/net/outmessage.hpp
@@ -3,6 +3,7 @@
 #include <concepts>
 #include <vector>
 #include <span>
+#include <cstring>
 
 #include "fixed_str.hpp"
 #include "quantized.hpp"
diff --git a/src/server/client.hpp b/src/server/client.hpp
index e4e158d..f93f20b 100644
--- a/src/server/client.hpp
+++ b/src/server/client.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <memory>
 #include "wsserver.hpp"
 #include "net/defs.hpp"
 #include "net/inmessage.hpp"
diff --git a/src/server/wsserver.cpp b/src/server/wsserver.cpp
index 721829b..2ed64e2 100644
--- a/src/server/wsserver.cpp
+++ b/src/server/wsserver.cpp
@@ -6,7 +6,7 @@
 
 sv::WSServer::WSServer(uint16_t port)
 {
-    ws_thread_ = std::make_unique<std::thread>([=]() {
+    ws_thread_ = std::make_unique<std::thread>([this, port]() {
         crow::SimpleApp app;
         app_ptr_ = (void*)&app;
 
@@ -21,7 +21,7 @@ sv::WSServer::WSServer(uint16_t port)
 
             // register connection
             id2conn_[conn_id] = &conn;
-            conn.userdata((void*)conn_id);
+	    conn.userdata(reinterpret_cast<void*>(static_cast<uintptr_t>(conn_id)));
             // push connection event
             events_.emplace_back(WSE_CONNECTED, conn_id);
         })
@@ -30,7 +30,7 @@ sv::WSServer::WSServer(uint16_t port)
 
             std::lock_guard<std::mutex> lock(mtx_);
 
-            WSConnId conn_id = (WSConnId)conn.userdata();
+	    WSConnId conn_id = static_cast<uint32_t>(reinterpret_cast<uintptr_t>(conn.userdata()));
 
             // push disonnected event
             events_.emplace_back(WSE_DISCONNECTED, conn_id);
@@ -43,7 +43,7 @@ sv::WSServer::WSServer(uint16_t port)
 
             std::lock_guard<std::mutex> lock(mtx_);
 
-            WSConnId conn_id = (WSConnId)conn.userdata();
+	    WSConnId conn_id = static_cast<uint32_t>(reinterpret_cast<uintptr_t>(conn.userdata()));
             events_.emplace_back(WSE_MESSAGE, conn_id, data);
 
         });
diff --git a/src/server/wsserver.hpp b/src/server/wsserver.hpp
index 86e3911..78f9aac 100644
--- a/src/server/wsserver.hpp
+++ b/src/server/wsserver.hpp
@@ -7,6 +7,7 @@
 #include <functional>
 #include <unordered_map>
 #include <unordered_set>
+#include <thread>
 
 namespace crow::websocket
 {
@@ -66,4 +67,4 @@ private:
 
 };
 
-}
\ No newline at end of file
+}