xrGame/GamePersistent.cpp: dedicated server crash fix

xrNetServer/ip_filter.cpp: replaced size() == 0 with empty()
OpenXRay · Jul 12, 2018 · 3607bdc · 3607bdc
1 parent da41e6e
commit 3607bdc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/xrGame/GamePersistent.cpp b/src/xrGame/GamePersistent.cpp
@@ -159,7 +159,8 @@ CGamePersistent::~CGamePersistent(void)
 
 void CGamePersistent::PreStart(LPCSTR op)
 {
-    pApp->SetLoadingScreen(new UILoadingScreen());
+    if (!GEnv.isDedicatedServer)
+        pApp->SetLoadingScreen(new UILoadingScreen());
     inherited::PreStart(op);
 }
 

diff --git a/src/xrNetServer/ip_filter.cpp b/src/xrNetServer/ip_filter.cpp
@@ -84,7 +84,7 @@ u32 ip_filter::load()
 
 bool ip_filter::is_ip_present(u32 ip_address)
 {
-    if (m_all_subnets.size() == 0)
+    if (m_all_subnets.empty())
         return true;
     subnet_item tmp_fake_item;
     hton_bo(ip_address, tmp_fake_item);