xrGame/GamePersistent.cpp: dedicated server crash fix

Xottab-DUTY · Xottab-DUTY · commit 3607bdc369b5 · 2018-07-13T01:34:45.000+05:00
xrNetServer/ip_filter.cpp: replaced size() == 0 with empty()
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);

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ CGamePersistent::~CGamePersistent(void)`
`159`	`159`
`160`	`160`	`void CGamePersistent::PreStart(LPCSTR op)`
`161`	`161`	`{`
`162`		`- pApp->SetLoadingScreen(new UILoadingScreen());`
	`162`	`+ if (!GEnv.isDedicatedServer)`
	`163`	`+ pApp->SetLoadingScreen(new UILoadingScreen());`
`163`	`164`	`inherited::PreStart(op);`
`164`	`165`	`}`
`165`	`166`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ u32 ip_filter::load()`
`84`	`84`
`85`	`85`	`bool ip_filter::is_ip_present(u32 ip_address)`
`86`	`86`	`{`
`87`		`- if (m_all_subnets.size() == 0)`
	`87`	`+ if (m_all_subnets.empty())`
`88`	`88`	`return true;`
`89`	`89`	`subnet_item tmp_fake_item;`
`90`	`90`	`hton_bo(ip_address, tmp_fake_item);`