diff --git a/Engine.cpp b/Engine.cpp index 48b80f3..d4af46b 100644 --- a/Engine.cpp +++ b/Engine.cpp @@ -37,7 +37,9 @@ #include "procedural/Noise.h" #include "plugin_framework/XLEngine_Plugin_API.h" #include "plugin_framework/PluginManager.h" +#if defined(ENABLE_NETWORKING) #include "networking/NetworkMgr.h" +#endif #include "math/Math.h" #include "PluginAPI_Func.h" @@ -231,6 +233,7 @@ bool Engine::Init(void **winParam, int32_t paramCnt, int32_t w, int32_t h) m_nWidth = w; m_nHeight = h; +#if defined(ENABLE_NETWORKING) if ( settings.IsServer() || settings.IsClient_MP() ) { uint32_t uWaitFrame = 0; @@ -320,6 +323,7 @@ bool Engine::Init(void **winParam, int32_t paramCnt, int32_t w, int32_t h) }; } } +#endif SetupPluginAPI(); return true; @@ -331,7 +335,9 @@ void Engine::Destroy() if ( settings.IsServer() || settings.IsClient_MP() ) { +#if defined(ENABLE_NETWORKING) NetworkMgr::Destroy(); +#endif } if ( m_pCamera ) @@ -762,8 +768,10 @@ bool Engine::Loop(float fDeltaTime, bool bFullspeed) m_fTotalTime += fDeltaTime*m_fFixedLoopsPerSec; while (m_fTotalTime >= 1.0f) { +#if defined(ENABLE_NETWORKING) //networking - which also occurs at 60fps. NetworkMgr::Loop(); +#endif //Game specific update. m_pGameUpdate( UPDATE_STAGE_FIXED, m_fFixedLoopTime, m_pPluginAPI, m_pGameUpdate_UD ); diff --git a/ui/Console.cpp b/ui/Console.cpp index 05adbe9..d23d51f 100644 --- a/ui/Console.cpp +++ b/ui/Console.cpp @@ -2,7 +2,9 @@ #include "../render/IDriver3D.h" #include "../render/FontManager.h" #include "../render/TextureCache.h" +#if defined(ENABLE_NETWORKING) #include "../networking/NetworkMgr.h" +#endif #include "../os/Input.h" #include "../math/Math.h" @@ -170,6 +172,7 @@ void Console::PassEnter() { if ( m_bActive == false ) { +#if defined(ENABLE_NETWORKING) if ( Input::LockMouse() ) { if ( m_bChatMode == true ) @@ -180,6 +183,7 @@ void Console::PassEnter() } m_bChatMode = !m_bChatMode; } +#endif return; } diff --git a/win/main.cpp b/win/main.cpp index 8d9691c..b57ff8a 100644 --- a/win/main.cpp +++ b/win/main.cpp @@ -4,7 +4,9 @@ #include "../Engine.h" #include "../OS/Input.h" #include "../OS/Clock.h" +#if defined(ENABLE_NETWORKING) #include "../networking/NetworkMgr.h" +#endif #include "../EngineSettings.h" #ifndef WM_XBUTTONDOWN @@ -176,7 +178,9 @@ int main(int argc, char *argv[]) { strcpy(szPlayerName, "Default_Player"); } +#if defined(ENABLE_NETWORKING) NetworkMgr::SetLocalPlayerName(szPlayerName); +#endif //Engine settings. EngineSettings &settings = EngineSettings::get();