Merge branch 'master' into small_stage_cleanup

Conflicts:
	common/EQStream.cpp
	zone/client.h

zone/MobAI.cpp

@@ -28,6 +28,7 @@
 #include "../common/moremath.h"
 #include "parser.h"
 #include "StringIDs.h"
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 #include "../common/rulesys.h"
 #include "../common/features.h"

zone/Object.cpp

@@ -24,6 +24,7 @@
 #include "zonedb.h"
 #include "../common/packet_functions.h"
 #include "../common/packet_dump.h"
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 #include "../common/features.h"
 #include "StringIDs.h"

zone/embparser.cpp

@@ -30,6 +30,7 @@
 #include "questmgr.h"
 #include "command.h"
 #include "../common/seperator.h"
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 #include "QGlobals.h"
 #include "zone.h"

zone/forage.cpp

@@ -31,6 +31,7 @@
 #include "watermap.h"
 #include "titles.h"
 #include "StringIDs.h"
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 #include "../common/rulesys.h"
 

zone/merc.cpp

@@ -8,6 +8,7 @@
 #include "../common/spdat.h"
 #include "zone.h"
 #include "StringIDs.h"
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 #include "../common/rulesys.h"
 #include "QuestParserCollection.h"

zone/npc.cpp

@@ -40,6 +40,7 @@
 #include "../common/spdat.h"
 #include "../common/bodytypes.h"
 #include "spawngroup.h"
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 #include "../common/rulesys.h"
 #include "StringIDs.h"

zone/tasks.cpp

@@ -27,6 +27,7 @@ Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 #define strcasecmp _stricmp
 #endif
 
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 #include "../common/rulesys.h"
 #include "masterentity.h"

zone/tradeskills.cpp

@@ -30,6 +30,7 @@
 #include "../common/packet_dump.h"
 #include "titles.h"
 #include "StringIDs.h"
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 #include "../common/rulesys.h"
 #include "QuestParserCollection.h"

zone/trap.cpp

@@ -20,6 +20,7 @@
 #include "entity.h"
 #include "masterentity.h"
 #include "../common/spdat.h"
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 
 /*

zone/waypoints.cpp

@@ -30,6 +30,7 @@
 #include "../common/moremath.h"
 #include "parser.h"
 #include "StringIDs.h"
+#include "../common/MiscFunctions.h"
 #include "../common/StringUtil.h"
 #include "../common/rulesys.h"
 #include "../common/features.h"