Merging

world/Adventure.cpp

@@ -3,6 +3,7 @@
 #include "../common/extprofile.h"
 #include "../common/rulesys.h"
 #include "../common/MiscFunctions.h"
+#include "../common/StringUtil.h"
 #include "Adventure.h"
 #include "AdventureManager.h"
 #include "worlddb.h"

world/AdventureManager.cpp

@@ -1,5 +1,6 @@
 #include "../common/debug.h"
 #include "../common/MiscFunctions.h"
+#include "../common/StringUtil.h"
 #include "../common/servertalk.h"
 #include "../common/rulesys.h"
 #include "Adventure.h"

world/EQLConfig.cpp

@@ -20,7 +20,7 @@
 #include "worlddb.h"
 #include "LauncherLink.h"
 #include "LauncherList.h"
-#include "../common/MiscFunctions.h"
+#include "../common/StringUtil.h"
 #include <cstdlib>
 #include <cstring>
 

world/EQW.cpp

@@ -25,7 +25,7 @@
 #include "../common/races.h"
 #include "../common/classes.h"
 #include "../common/misc.h"
-#include "../common/MiscFunctions.h"
+#include "../common/StringUtil.h"
 #include "zoneserver.h"
 #include "zonelist.h"
 #include "clientlist.h"

world/LauncherLink.cpp

@@ -25,6 +25,7 @@
 #include "../common/packet_dump.h"
 #include "../common/servertalk.h"
 #include "../common/EmuTCPConnection.h"
+#include "../common/StringUtil.h"
 #include "worlddb.h"
 #include "EQLConfig.h"
 

world/LoginServer.cpp

@@ -29,9 +29,6 @@
 	#include <winsock.h>
 
 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp	_stricmp
 #else // Pyro: fix for linux
@@ -59,7 +56,7 @@
 #include "LoginServerList.h"
 #include "../common/eq_packet_structs.h"
 #include "../common/packet_dump.h"
-#include "../common/MiscFunctions.h"
+#include "../common/StringUtil.h"
 #include "zoneserver.h"
 #include "worlddb.h"
 #include "zonelist.h"

world/client.cpp

@@ -18,9 +18,6 @@
 	#include <windows.h>
 	#include <winsock.h>
 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp	_stricmp
 #else
@@ -46,7 +43,7 @@
 #include "../common/languages.h"
 #include "../common/skills.h"
 #include "../common/extprofile.h"
-#include "../common/MiscFunctions.h"
+#include "../common/StringUtil.h"
 #include "WorldConfig.h"
 #include "LoginServer.h"
 #include "LoginServerList.h"

world/cliententry.cpp

@@ -24,6 +24,7 @@
 #include "zoneserver.h"
 #include "WorldConfig.h"
 #include "../common/guilds.h"
+#include "../common/StringUtil.h"
 
 extern uint32 numplayers;
 extern LoginServerList loginserverlist;

world/clientlist.cpp

@@ -22,6 +22,7 @@
 #include "client.h"
 #include "console.h"
 #include "worlddb.h"
+#include "../common/StringUtil.h"
 #include "../common/guilds.h"
 #include "../common/races.h"
 #include "../common/classes.h"

world/console.cpp

@@ -38,6 +38,7 @@
 #include "../common/opcodemgr.h"
 #include "../common/rulesys.h"
 #include "../common/ruletypes.h"
+#include "../common/StringUtil.h"
 #include "WorldConfig.h"
 #include "zoneserver.h"
 #include "zonelist.h"
@@ -48,9 +49,6 @@
 
 #ifdef _WINDOWS
 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp	_stricmp
 #endif

world/net.cpp

@@ -46,9 +46,6 @@
 #ifdef _WINDOWS
 	#include <process.h>
 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp	_stricmp
 	#include <conio.h>

world/worlddb.cpp

@@ -18,7 +18,7 @@
 
 #include "worlddb.h"
 //#include "../common/Item.h"
-#include "../common/MiscFunctions.h"
+#include "../common/StringUtil.h"
 #include "../common/eq_packet_structs.h"
 #include "../common/Item.h"
 #include "../common/dbasync.h"

world/zonelist.cpp

@@ -23,7 +23,7 @@
 #include "console.h"
 #include "WorldConfig.h"
 #include "../common/servertalk.h"
-#include "../common/MiscFunctions.h"
+#include "../common/StringUtil.h"
 
 extern uint32			numzones;
 extern bool holdzones;

world/zoneserver.cpp

@@ -29,7 +29,7 @@
 #include "../common/guilds.h"
 #include "../common/packet_dump.h"
 #include "../common/misc.h"
-#include "../common/MiscFunctions.h"
+#include "../common/StringUtil.h"
 #include "cliententry.h"
 #include "wguild_mgr.h"
 #include "lfplist.h"