Server: Fix numerous Clang warnings

Author: twostars

Server/AIServer/AIServer.vcxproj

@@ -139,14 +139,13 @@
     <ClCompile Include="AISocketManager.cpp" />
     <ClCompile Include="GameSocket.cpp" />
     <ClCompile Include="MagicProcess.cpp" />
-    <ClCompile Include="MAP.cpp" />
+    <ClCompile Include="Map.cpp" />
     <ClCompile Include="Npc.cpp" />
     <ClCompile Include="NpcItem.cpp" />
     <ClCompile Include="NpcMagicProcess.cpp" />
     <ClCompile Include="NpcThread.cpp" />
     <ClCompile Include="Party.cpp" />
     <ClCompile Include="PathFind.cpp" />
-    <ClCompile Include="Region.cpp" />
     <ClCompile Include="RoomEvent.cpp" />
     <ClCompile Include="SendThreadMain.cpp" />
     <ClCompile Include="AIServer.cpp" />
@@ -164,7 +163,7 @@
     <ClInclude Include="Extern.h" />
     <ClInclude Include="GameSocket.h" />
     <ClInclude Include="MagicProcess.h" />
-    <ClInclude Include="MAP.h" />
+    <ClInclude Include="Map.h" />
     <ClInclude Include="Npc.h" />
     <ClInclude Include="NpcItem.h" />
     <ClInclude Include="NpcMagicProcess.h" />

Server/AIServer/AIServer.vcxproj.filters

@@ -20,7 +20,7 @@
     <ClCompile Include="MagicProcess.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MAP.cpp">
+    <ClCompile Include="Map.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Npc.cpp">
@@ -41,9 +41,6 @@
     <ClCompile Include="PathFind.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Region.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="RoomEvent.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -85,7 +82,7 @@
     <ClInclude Include="MagicProcess.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MAP.h">
+    <ClInclude Include="Map.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Npc.h">

Server/AIServer/AIServerApp.cpp

@@ -1020,7 +1020,7 @@ void AIServerApp::AllNpcInfo()
 	int nZone = 0;
 	int size = _npcMap.GetSize();
 
-	int send_index = 0, zone_index = 0, packet_size = 0;
+	int send_index = 0;
 	int count = 0, send_count = 0, send_tot = 0;
 	char send_buff[2048] = {};
 
@@ -1036,9 +1036,8 @@ void AIServerApp::AllNpcInfo()
 		SetByte(send_buff, AG_SERVER_INFO, send_index);
 		SetByte(send_buff, SERVER_INFO_START, send_index);
 		SetByte(send_buff, nZone, send_index);
-		packet_size = Send(send_buff, send_index, nZone);
+		Send(send_buff, send_index, nZone);
 
-		zone_index = GetZoneIndex(nZone);
 		send_index = 2;
 		count = 0;
 		send_count = 0;
@@ -1077,9 +1076,10 @@ void AIServerApp::AllNpcInfo()
 				send_count = 0;
 				count = 0;
 				send_tot++;
-				//TRACE(_T("AllNpcInfo - send_count=%d, count=%d, zone=%d\n"), send_tot, count, nZone);
+				spdlog::trace("AIServerApp::AllNpcInfo: send_count={}, count={}, zone={}",
+					send_tot, count, nZone);
 				memset(send_buff, 0, sizeof(send_buff));
-				Sleep(50);
+				std::this_thread::sleep_for(50ms);
 			}
 		}
 
@@ -1092,8 +1092,9 @@ void AIServerApp::AllNpcInfo()
 			SetByte(send_buff, (uint8_t) count, send_count);
 			Send(send_buff, send_index, nZone);
 			send_tot++;
-			//TRACE(_T("AllNpcInfo - send_count=%d, count=%d, zone=%d\n"), send_tot, count, nZone);
-			Sleep(50);
+			spdlog::trace("AIServerApp::AllNpcInfo: send_count={}, count={}, zone={}",
+				send_tot, count, nZone);
+			std::this_thread::sleep_for(50ms);
 		}
 
 		send_index = 0;
@@ -1102,12 +1103,12 @@ void AIServerApp::AllNpcInfo()
 		SetByte(send_buff, SERVER_INFO_END, send_index);
 		SetByte(send_buff, nZone, send_index);
 		SetShort(send_buff, (int16_t) _totalNpcCount, send_index);
-		packet_size = Send(send_buff, send_index, nZone);
+		Send(send_buff, send_index, nZone);
 
 		spdlog::debug("AIServerApp::AllNpcInfo: end for zoneId={}", nZone);
 	}
 
-	Sleep(1000);
+	std::this_thread::sleep_for(1s);
 }
 // ~sungyong 2002.05.23
 
@@ -1154,7 +1155,6 @@ void AIServerApp::CheckAliveTest()
 {
 	int send_index = 0;
 	char send_buff[256] = {};
-	int iErrorCode = 0;
 
 	SetByte(send_buff, AG_CHECK_ALIVE_REQ, send_index);
 
@@ -1291,7 +1291,7 @@ int AIServerApp::Send(const char* pData, int length, int nZone)
 		return 0;
 
 	if (length <= 0
-		|| length > sizeof(_SEND_DATA::pBuf))
+		|| length > static_cast<int>(sizeof(_SEND_DATA::pBuf)))
 		return 0;
 
 	_SEND_DATA* pNewData = new _SEND_DATA;
@@ -1319,7 +1319,6 @@ void AIServerApp::SyncTest()
 
 	int send_index = 0;
 	char send_buff[256] = {};
-	int iErrorCode = 0;
 
 	SetByte(send_buff, AG_CHECK_ALIVE_REQ, send_index);
 
@@ -1356,7 +1355,7 @@ void AIServerApp::TestCode()
 			count_3++;
 	}
 
-	//TRACE(_T("$$$ random test == 1=%d, 2=%d, 3=%d,, %d,%hs $$$\n"), count_1, count_2, count_3, __FILE__, __LINE__);
+	spdlog::debug("AIServerApp::TestCode: random test 1={} 2={} 3={}", count_1, count_2, count_3);
 }
 
 bool AIServerApp::GetMagicType1Data()
@@ -1457,33 +1456,26 @@ void AIServerApp::RegionCheck()
 
 bool AIServerApp::AddObjectEventNpc(_OBJECT_EVENT* pEvent, int zone_number)
 {
-	int i = 0, j = 0, objectid = 0;
 	model::Npc* pNpcTable = nullptr;
-	bool bFindNpcTable = false;
-	int offset = 0;
 	int nServerNum = GetServerNumber(zone_number);
 	if (_serverZoneType != nServerNum)
 		return false;
 
 	pNpcTable = _npcTableMap.GetData(pEvent->sIndex);
 	if (pNpcTable == nullptr)
 	{
-		bFindNpcTable = false;
 		spdlog::error("AIServerApp::AddObjectEventNpc error: eventId={} zoneId={}",
 			pEvent->sIndex, zone_number);
 		return false;
 	}
 
-	bFindNpcTable = true;
-
 	CNpc* pNpc = new CNpc();
 
 	pNpc->m_sNid = _mapEventNpcCount++;				// 서버 내에서의 고유 번호
 	pNpc->m_sSid = (int16_t) pEvent->sIndex;			// MONSTER(NPC) Serial ID
 
 	pNpc->m_byMoveType = 100;
 	pNpc->m_byInitMoveType = 100;
-	bFindNpcTable = false;
 
 	pNpc->m_byMoveType = 0;
 	pNpc->m_byInitMoveType = 0;
@@ -1518,7 +1510,6 @@ bool AIServerApp::AddObjectEventNpc(_OBJECT_EVENT* pEvent, int zone_number)
 	//pNpc->m_ZoneIndex = GetZoneIndex(pNpc->m_sCurZone);
 /*
 	if(pNpc->m_ZoneIndex == -1)	{
-		AfxMessageBox("Invaild zone Index!!");
 		return false;
 	}	*/
 

Server/AIServer/AIServerApp.h

@@ -5,7 +5,7 @@
 
 #include "AISocketManager.h"
 
-#include "MAP.h"
+#include "Map.h"
 #include "NpcItem.h"
 #include "Npc.h"
 

Server/AIServer/CMakeLists.txt

@@ -28,7 +28,6 @@ add_executable(AIServer
   PathFind.cpp
   PathFind.h
   pch.h
-  Region.cpp
   Region.h
   resource.h
   RoomEvent.cpp
@@ -66,6 +65,6 @@ target_link_libraries(AIServer
 # Setup warning levels
 target_compile_options(AIServer PRIVATE
   $<$<CXX_COMPILER_ID:MSVC>:/W3>
-  $<$<CXX_COMPILER_ID:GNU>:-Wall -Wextra -Wpedantic>
-  $<$<CXX_COMPILER_ID:Clang>:-Wall -Wextra -Wpedantic>
+  $<$<CXX_COMPILER_ID:GNU>:-Wall -Wextra -Wpedantic -Wno-gnu-anonymous-struct -Wno-nested-anon-types>
+  $<$<CXX_COMPILER_ID:Clang>:-Wall -Wextra -Wpedantic -Wno-gnu-anonymous-struct -Wno-nested-anon-types>
 )