xrGame: fix linux linkage IPureClient and IPureServer (just dumb clas…

…ses) make running script executable.
OpenXRay · Oct 3, 2018 · f26a002 · f26a002
1 parent 84bbe74
commit f26a002
Show file tree

Hide file tree

Showing 14 changed files with 1,832 additions and 4 deletions.
diff --git a/src/xrGame/CMakeLists.txt b/src/xrGame/CMakeLists.txt
@@ -32,6 +32,8 @@ list(APPEND DIRS
     "ui"
     "gamespy"
     "../xrServerEntities"
+    "../xrNetServer"
+    "../xrNetServer/empty"
     )
 
 add_dir("${DIRS}")
@@ -68,6 +70,9 @@ list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./stalker
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./static_cast_checked_test.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_Client_BattlEye.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_Server_BattlEye.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../xrNetServer/NET_Client.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../xrNetServer/NET_Server.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../xrNetServer/NET_Compressor.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ai/monsters/rats/ai_rat_fsm.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/CExtraContentFilter.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIDebugFonts.cpp")
@@ -95,6 +100,9 @@ list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./game_c
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./stalker_animation_offsets.h")
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_Client_BattlEye.h")
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_Server_BattlEye.h")
+list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrNetServer/NET_Client.h")
+list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrNetServer/NET_Server.h")
+list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrNetServer/NET_Compressor.h")
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/ui/CExtraContentFilter.h")
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIDebugFonts.h")
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIFrags.h")

diff --git a/src/xrGame/GamePersistent.cpp b/src/xrGame/GamePersistent.cpp
@@ -466,6 +466,7 @@ void CGamePersistent::WeathersUpdate()
 
 bool allow_intro()
 {
+#if defined(WINDOWS)
 #ifdef MASTER_GOLD
     if (g_SASH.IsRunning())
 #else // #ifdef MASTER_GOLD
@@ -475,6 +476,7 @@ bool allow_intro()
         return false;
     }
     else
+#endif
         return true;
 }
 

diff --git a/src/xrGame/Level.h b/src/xrGame/Level.h
@@ -2,7 +2,11 @@
 
 #include "xrEngine/IGame_Level.h"
 #include "xrEngine/IGame_Persistent.h"
+#if defined(WINDOWS)
 #include "xrNetServer/NET_Client.h"
+#elif defined(LINUX)
+#include "xrNetServer/empty/NET_Client.h"
+#endif
 #include "xrEngine/StatGraph.h"
 #include "xrMessages.h"
 #include "alife_space.h"

diff --git a/src/xrGame/game_sv_base.h b/src/xrGame/game_sv_base.h
@@ -7,7 +7,11 @@
 #include "game_sv_base_console_vars.h"
 #include "game_sv_event_queue.h"
 #include "game_sv_item_respawner.h"
+#if defined(WINDOWS)
 #include "xrNetServer/NET_Server.h"
+#elif defined(LINUX)
+#include "xrNetServer/empty/NET_Server.h"
+#endif
 
 #define MAX_PLAYERS_COUNT 32
 

diff --git a/src/xrGame/xrServer.h b/src/xrGame/xrServer.h
@@ -7,7 +7,11 @@
 #define AFX_XRSERVER_H__65728A25_16FC_4A7B_8CCE_D798CA5EC64E__INCLUDED_
 #pragma once
 
+#if defined(WINDOWS)
 #include "xrNetServer/NET_Server.h"
+#elif defined(LINUX)
+#include "xrNetServer/empty/NET_Server.h"
+#endif
 #include "game_sv_base.h"
 #include "id_generator.h"
 #include "xrEngine/mp_logging.h"
@@ -75,7 +79,7 @@ typedef xr_vector<CheaterToKick> cheaters_t;
 namespace file_transfer
 {
 class server_site;
-}; // namespace file_transfer
+} // namespace file_transfer
 
 class clientdata_proxy;
 class server_info_uploader;

diff --git a/src/xrNetServer/NET_Common.cpp b/src/xrNetServer/NET_Common.cpp
@@ -74,7 +74,7 @@ MultipacketSender::~MultipacketSender()
 void MultipacketSender::SendPacket(const void* packet_data, u32 packet_sz, u32 flags, u32 timeout)
 {
     _buf_cs->Enter();
-
+#if defined(WINDOWS)
     //PrintParsedPacket("-- LL Sending:", 1, packet_data, packet_sz);
 
     Buffer* buf = &_buf;
@@ -111,6 +111,7 @@ void MultipacketSender::SendPacket(const void* packet_data, u32 packet_sz, u32 f
         _FlushSendBuffer(timeout, buf);
 
     buf->last_flags = flags;
+#endif
     _buf_cs->Leave();
 }
 

diff --git a/src/xrNetServer/NET_Shared.h b/src/xrNetServer/NET_Shared.h
@@ -36,11 +36,13 @@ enum
 IC u32 TimeGlobal(CTimer* timer) { return timer->GetElapsed_ms(); }
 IC u32 TimerAsync(CTimer* timer) { return TimeGlobal(timer); }
 
+#if defined(WINDOWS)
 // DPlay
 extern "C"
 {
     typedef struct _DPN_CONNECTION_INFO DPN_CONNECTION_INFO;
 }
+#endif
 
 class XRNETSERVER_API IClientStatistic
 {
@@ -52,7 +54,9 @@ class XRNETSERVER_API IClientStatistic
     IClientStatistic(const IClientStatistic& rhs); // Required due to probable bug in CLevel::ProcessCompressedUpdate
     ~IClientStatistic();
 
+#if defined(WINDOWS)
     void Update(DPN_CONNECTION_INFO& CI);
+#endif
 
     u32 getPing() const;
     u32 getBPS() const;