merge upstream

This commit is contained in:
Arthur Ice
2014-12-21 13:45:26 -08:00
193 changed files with 4491 additions and 9483 deletions
+5 -1
View File
@@ -67,10 +67,14 @@ struct item_tick_struct {
std::string qglobal;
};
class Client;
class Map;
class WaterMap;
class Mob;
class PathManager;
class WaterMap;
extern EntityList entity_list;
struct NPCType;
struct ServerZoneIncommingClient_Struct;
class Zone
{