From 0d9b6703a61e6d0ea6073980b6d3a00d8212a8e5 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 19 Jan 2015 04:12:09 -0600 Subject: [PATCH] Rename debug.h to global_define.h, update cmakelists and such --- client_files/export/main.cpp | 2 +- client_files/import/main.cpp | 2 +- common/CMakeLists.txt | 2 +- common/SocketLib/HTTPSocket.cpp | 2 +- common/SocketLib/HttpdCookies.cpp | 2 +- common/SocketLib/HttpdSocket.cpp | 2 +- common/base_packet.cpp | 2 +- common/classes.cpp | 2 +- common/condition.h | 2 +- common/crash.cpp | 2 +- common/database.cpp | 2 +- common/database.h | 2 +- common/debug.h | 41 ------------------------------- common/emu_opcodes.cpp | 2 +- common/emu_tcp_connection.cpp | 2 +- common/emu_tcp_server.cpp | 2 +- common/eq_packet.cpp | 2 +- common/eq_stream.cpp | 2 +- common/eq_stream_factory.cpp | 2 +- common/eq_stream_ident.cpp | 2 +- common/eq_stream_proxy.cpp | 2 +- common/eqdb.cpp | 2 +- common/eqdb_res.cpp | 2 +- common/eqemu_config.cpp | 2 +- common/eqtime.cpp | 2 +- common/extprofile.cpp | 2 +- common/guilds.cpp | 2 +- common/item.cpp | 2 +- common/misc.cpp | 2 +- common/misc_functions.cpp | 2 +- common/mutex.cpp | 2 +- common/opcode_map.cpp | 2 +- common/packet_dump_file.cpp | 2 +- common/packet_functions.cpp | 2 +- common/patches/patches.cpp | 2 +- common/patches/rof.cpp | 2 +- common/patches/rof2.cpp | 2 +- common/patches/sod.cpp | 2 +- common/patches/sof.cpp | 2 +- common/patches/titanium.cpp | 2 +- common/patches/underfoot.cpp | 2 +- common/perl_eqdb.cpp | 2 +- common/perl_eqdb_res.cpp | 2 +- common/proc_launcher.cpp | 2 +- common/proc_launcher.h | 2 +- common/ptimer.cpp | 2 +- common/struct_strategy.cpp | 2 +- common/tcp_connection.cpp | 2 +- common/tcp_server.cpp | 2 +- common/timeoutmgr.cpp | 2 +- common/timer.h | 2 +- common/worldconn.cpp | 2 +- common/xml_parser.cpp | 2 +- common/xml_parser.h | 2 +- eqlaunch/eqlaunch.cpp | 2 +- eqlaunch/worldserver.cpp | 2 +- eqlaunch/zone_launch.cpp | 2 +- queryserv/database.cpp | 2 +- queryserv/database.h | 2 +- queryserv/queryserv.cpp | 2 +- queryserv/queryservconfig.cpp | 2 +- queryserv/worldserver.cpp | 2 +- shared_memory/base_data.cpp | 2 +- shared_memory/items.cpp | 2 +- shared_memory/loot.cpp | 2 +- shared_memory/main.cpp | 2 +- shared_memory/npc_faction.cpp | 2 +- shared_memory/skill_caps.cpp | 2 +- shared_memory/spells.cpp | 2 +- ucs/clientlist.cpp | 2 +- ucs/database.cpp | 2 +- ucs/database.h | 2 +- ucs/ucs.cpp | 2 +- ucs/ucsconfig.cpp | 2 +- ucs/worldserver.cpp | 2 +- world/adventure.cpp | 2 +- world/adventure.h | 2 +- world/adventure_manager.cpp | 2 +- world/adventure_manager.h | 2 +- world/adventure_template.h | 2 +- world/client.cpp | 2 +- world/cliententry.cpp | 2 +- world/clientlist.cpp | 2 +- world/console.cpp | 2 +- world/eql_config.cpp | 2 +- world/eqw.cpp | 2 +- world/eqw_http_handler.cpp | 2 +- world/eqw_parser.cpp | 2 +- world/http_request.cpp | 2 +- world/launcher_link.cpp | 2 +- world/launcher_list.cpp | 2 +- world/login_server.cpp | 2 +- world/login_server_list.cpp | 2 +- world/net.cpp | 4 +-- world/perl_eql_config.cpp | 2 +- world/perl_eqw.cpp | 2 +- world/perl_http_request.cpp | 2 +- world/queryserv.cpp | 2 +- world/ucs.cpp | 2 +- world/wguild_mgr.cpp | 2 +- world/world_config.cpp | 2 +- world/zonelist.cpp | 2 +- world/zoneserver.cpp | 2 +- zone/aa.cpp | 2 +- zone/aggro.cpp | 2 +- zone/attack.cpp | 2 +- zone/bonuses.cpp | 2 +- zone/bot.h | 2 +- zone/client.cpp | 2 +- zone/client_mods.cpp | 2 +- zone/client_packet.cpp | 2 +- zone/client_process.cpp | 2 +- zone/command.cpp | 2 +- zone/corpse.cpp | 2 +- zone/doors.cpp | 2 +- zone/effects.cpp | 2 +- zone/embparser.cpp | 2 +- zone/embparser_api.cpp | 2 +- zone/embperl.cpp | 2 +- zone/embxs.cpp | 2 +- zone/entity.cpp | 2 +- zone/exp.cpp | 2 +- zone/forage.cpp | 2 +- zone/groups.cpp | 2 +- zone/horse.cpp | 2 +- zone/inventory.cpp | 2 +- zone/loottables.cpp | 2 +- zone/map.cpp | 2 +- zone/mob_ai.cpp | 2 +- zone/net.cpp | 2 +- zone/npc.cpp | 2 +- zone/object.cpp | 2 +- zone/pathing.cpp | 2 +- zone/perl_client.cpp | 2 +- zone/perl_doors.cpp | 2 +- zone/perl_entity.cpp | 2 +- zone/perl_groups.cpp | 2 +- zone/perl_hateentry.cpp | 2 +- zone/perl_mob.cpp | 2 +- zone/perl_npc.cpp | 2 +- zone/perl_object.cpp | 2 +- zone/perl_perlpacket.cpp | 2 +- zone/perl_player_corpse.cpp | 2 +- zone/perl_questitem.cpp | 2 +- zone/perl_raids.cpp | 2 +- zone/perlpacket.cpp | 2 +- zone/petitions.cpp | 2 +- zone/pets.cpp | 2 +- zone/queryserv.cpp | 2 +- zone/quest_parser_collection.cpp | 2 +- zone/questmgr.cpp | 2 +- zone/spawn2.cpp | 2 +- zone/spawngroup.cpp | 2 +- zone/spell_effects.cpp | 2 +- zone/spells.cpp | 2 +- zone/tasks.cpp | 2 +- zone/tradeskills.cpp | 2 +- zone/trading.cpp | 2 +- zone/tribute.cpp | 2 +- zone/waypoints.cpp | 2 +- zone/worldserver.cpp | 2 +- zone/zone.cpp | 2 +- zone/zoning.cpp | 2 +- 163 files changed, 163 insertions(+), 204 deletions(-) delete mode 100644 common/debug.h diff --git a/client_files/export/main.cpp b/client_files/export/main.cpp index 45dd34cec..c60b7266c 100644 --- a/client_files/export/main.cpp +++ b/client_files/export/main.cpp @@ -19,7 +19,7 @@ #include #include "../../common/eqemu_logsys.h" -#include "../../common/debug.h" +#include "../../common/global_define.h" #include "../../common/shareddb.h" #include "../../common/eqemu_config.h" #include "../../common/platform.h" diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp index 8567723ce..3d6511d8f 100644 --- a/client_files/import/main.cpp +++ b/client_files/import/main.cpp @@ -17,7 +17,7 @@ */ #include "../../common/eqemu_logsys.h" -#include "../../common/debug.h" +#include "../../common/global_define.h" #include "../../common/shareddb.h" #include "../../common/eqemu_config.h" #include "../../common/platform.h" diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index fe57eab59..cc5949d44 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -103,7 +103,6 @@ SET(common_headers data_verification.h database.h dbcore.h - debug.h deity.h emu_opcodes.h emu_oplist.h @@ -133,6 +132,7 @@ SET(common_headers features.h fixed_memory_hash_set.h fixed_memory_variable_hash_set.h + global_define.h guild_base.h guilds.h ipc_mutex.h diff --git a/common/SocketLib/HTTPSocket.cpp b/common/SocketLib/HTTPSocket.cpp index ecde78403..da4f2264c 100644 --- a/common/SocketLib/HTTPSocket.cpp +++ b/common/SocketLib/HTTPSocket.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef _WIN32 #pragma warning(disable:4786) #endif -#include "../debug.h" +#include "../global_define.h" #include #include #include diff --git a/common/SocketLib/HttpdCookies.cpp b/common/SocketLib/HttpdCookies.cpp index 4d9fccb1b..a40200aab 100644 --- a/common/SocketLib/HttpdCookies.cpp +++ b/common/SocketLib/HttpdCookies.cpp @@ -26,7 +26,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../debug.h" +#include "../global_define.h" #ifdef _WIN32 #pragma warning(disable:4786) #endif diff --git a/common/SocketLib/HttpdSocket.cpp b/common/SocketLib/HttpdSocket.cpp index bd803877a..8ed3041e4 100644 --- a/common/SocketLib/HttpdSocket.cpp +++ b/common/SocketLib/HttpdSocket.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef _WIN32 #pragma warning(disable:4786) #endif -#include "../debug.h" +#include "../global_define.h" #include "Utility.h" #include "HttpdCookies.h" #include "HttpdForm.h" diff --git a/common/base_packet.cpp b/common/base_packet.cpp index e871ea71f..ce6afe978 100644 --- a/common/base_packet.cpp +++ b/common/base_packet.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "debug.h" +#include "global_define.h" #include "base_packet.h" #include "misc.h" #include "packet_dump.h" diff --git a/common/classes.cpp b/common/classes.cpp index 6270656f4..1f54c9234 100644 --- a/common/classes.cpp +++ b/common/classes.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/classes.h" const char* GetEQClassName(uint8 class_, uint8 level) { diff --git a/common/condition.h b/common/condition.h index dde51cb6d..9c4cd9f7b 100644 --- a/common/condition.h +++ b/common/condition.h @@ -18,7 +18,7 @@ #ifndef __CONDITION_H #define __CONDITION_H -#include "debug.h" +#include "global_define.h" #include "mutex.h" #ifndef WIN32 #include diff --git a/common/crash.cpp b/common/crash.cpp index fee4dcddf..1f700f151 100644 --- a/common/crash.cpp +++ b/common/crash.cpp @@ -1,4 +1,4 @@ -#include "debug.h" +#include "global_define.h" #include "eqemu_logsys.h" #include "crash.h" diff --git a/common/database.cpp b/common/database.cpp index 8beb3336b..91edc8b4a 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/rulesys.h" #include diff --git a/common/database.h b/common/database.h index 424a0dfa9..e6515c5f6 100644 --- a/common/database.h +++ b/common/database.h @@ -21,7 +21,7 @@ #define AUTHENTICATION_TIMEOUT 60 #define INVALID_ID 0xFFFFFFFF -#include "debug.h" +#include "global_define.h" #include "eqemu_logsys.h" #include "types.h" #include "dbcore.h" diff --git a/common/debug.h b/common/debug.h deleted file mode 100644 index 0c5d32ee9..000000000 --- a/common/debug.h +++ /dev/null @@ -1,41 +0,0 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2015 EQEMu Development Team (http://eqemu.org) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#if defined(_DEBUG) && defined(WIN32) - #ifndef _CRTDBG_MAP_ALLOC - #include - #include - #endif -#endif - -#ifndef EQDEBUG_H -#define EQDEBUG_H - -#define _WINSOCKAPI_ //stupid windows, trying to fix the winsock2 vs. winsock issues -#if defined(WIN32) && ( defined(PACKETCOLLECTOR) || defined(COLLECTOR) ) - // Packet Collector on win32 requires winsock.h due to latest pcap.h - // winsock.h must come before windows.h - #include -#endif - -#ifdef _WINDOWS - #include - #include -#endif - -#endif diff --git a/common/emu_opcodes.cpp b/common/emu_opcodes.cpp index 49da5e140..00f45fa25 100644 --- a/common/emu_opcodes.cpp +++ b/common/emu_opcodes.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA */ -#include "debug.h" +#include "global_define.h" #include "emu_opcodes.h" const char *OpcodeNames[_maxEmuOpcode+1] = { diff --git a/common/emu_tcp_connection.cpp b/common/emu_tcp_connection.cpp index 805b4b333..2ca55b975 100644 --- a/common/emu_tcp_connection.cpp +++ b/common/emu_tcp_connection.cpp @@ -23,7 +23,7 @@ crap into its own subclass of this object, it will clean things up tremendously. */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include diff --git a/common/emu_tcp_server.cpp b/common/emu_tcp_server.cpp index 985be6edd..4509c399f 100644 --- a/common/emu_tcp_server.cpp +++ b/common/emu_tcp_server.cpp @@ -1,4 +1,4 @@ -#include "debug.h" +#include "global_define.h" #include "emu_tcp_server.h" #include "emu_tcp_connection.h" diff --git a/common/eq_packet.cpp b/common/eq_packet.cpp index 60d892c23..ffc3666cb 100644 --- a/common/eq_packet.cpp +++ b/common/eq_packet.cpp @@ -17,7 +17,7 @@ */ #include "crc16.h" -#include "debug.h" +#include "global_define.h" #include "eq_packet.h" #include "misc.h" #include "op_codes.h" diff --git a/common/eq_stream.cpp b/common/eq_stream.cpp index 4d3fa5d46..0c5c6cacf 100644 --- a/common/eq_stream.cpp +++ b/common/eq_stream.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "debug.h" +#include "global_define.h" #include "eqemu_logsys.h" #include "eq_packet.h" #include "eq_stream.h" diff --git a/common/eq_stream_factory.cpp b/common/eq_stream_factory.cpp index 4a75068b6..a6a1d800a 100644 --- a/common/eq_stream_factory.cpp +++ b/common/eq_stream_factory.cpp @@ -1,4 +1,4 @@ -#include "debug.h" +#include "global_define.h" #include "eqemu_logsys.h" #include "eq_stream_factory.h" diff --git a/common/eq_stream_ident.cpp b/common/eq_stream_ident.cpp index b42bd4037..6fef4275e 100644 --- a/common/eq_stream_ident.cpp +++ b/common/eq_stream_ident.cpp @@ -1,4 +1,4 @@ -#include "debug.h" +#include "global_define.h" #include "eqemu_logsys.h" #include "eq_stream_ident.h" #include "eq_stream_proxy.h" diff --git a/common/eq_stream_proxy.cpp b/common/eq_stream_proxy.cpp index 20fc4ea06..6de6941ed 100644 --- a/common/eq_stream_proxy.cpp +++ b/common/eq_stream_proxy.cpp @@ -1,5 +1,5 @@ -#include "debug.h" +#include "global_define.h" #include "eq_stream_proxy.h" #include "eq_stream.h" #include "struct_strategy.h" diff --git a/common/eqdb.cpp b/common/eqdb.cpp index 03746b0d4..2c912afba 100644 --- a/common/eqdb.cpp +++ b/common/eqdb.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "debug.h" +#include "global_define.h" #include "eqdb.h" #include "database.h" #include diff --git a/common/eqdb_res.cpp b/common/eqdb_res.cpp index f34229a1f..11d90459d 100644 --- a/common/eqdb_res.cpp +++ b/common/eqdb_res.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "debug.h" +#include "global_define.h" #include "eqdb_res.h" #include diff --git a/common/eqemu_config.cpp b/common/eqemu_config.cpp index a2483c9b8..6e1400904 100644 --- a/common/eqemu_config.cpp +++ b/common/eqemu_config.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "eqemu_config.h" #include "misc_functions.h" diff --git a/common/eqtime.cpp b/common/eqtime.cpp index dcb3db359..adfd86923 100644 --- a/common/eqtime.cpp +++ b/common/eqtime.cpp @@ -17,7 +17,7 @@ */ #include -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/eqtime.h" #include "../common/eq_packet_structs.h" diff --git a/common/extprofile.cpp b/common/extprofile.cpp index 0ea3fb7a1..f29ec1e6e 100644 --- a/common/extprofile.cpp +++ b/common/extprofile.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "debug.h" +#include "global_define.h" #include "extprofile.h" //Set defaults in the extended profile... diff --git a/common/guilds.cpp b/common/guilds.cpp index 6098c2e1b..408f28714 100644 --- a/common/guilds.cpp +++ b/common/guilds.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "misc_functions.h" #include "guilds.h" #include "database.h" diff --git a/common/item.cpp b/common/item.cpp index df078491e..af0921ce0 100644 --- a/common/item.cpp +++ b/common/item.cpp @@ -17,7 +17,7 @@ */ #include "classes.h" -#include "debug.h" +#include "global_define.h" #include "item.h" #include "races.h" #include "rulesys.h" diff --git a/common/misc.cpp b/common/misc.cpp index 61ac556f5..792dfcbab 100644 --- a/common/misc.cpp +++ b/common/misc.cpp @@ -2,7 +2,7 @@ // VS6 doesn't like the length of STL generated names: disabling #pragma warning(disable:4786) #endif -#include "debug.h" +#include "global_define.h" #include #include #include diff --git a/common/misc_functions.cpp b/common/misc_functions.cpp index 18171c0a8..dcdbad561 100644 --- a/common/misc_functions.cpp +++ b/common/misc_functions.cpp @@ -17,7 +17,7 @@ */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "misc_functions.h" #include #include diff --git a/common/mutex.cpp b/common/mutex.cpp index 7bea92b0d..1dfacb5bb 100644 --- a/common/mutex.cpp +++ b/common/mutex.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/mutex.h" #include diff --git a/common/opcode_map.cpp b/common/opcode_map.cpp index fdaaf3fa1..7c8fed281 100644 --- a/common/opcode_map.cpp +++ b/common/opcode_map.cpp @@ -1,4 +1,4 @@ -#include "debug.h" +#include "global_define.h" #include #include diff --git a/common/packet_dump_file.cpp b/common/packet_dump_file.cpp index 95a72bb60..514ea610b 100644 --- a/common/packet_dump_file.cpp +++ b/common/packet_dump_file.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include diff --git a/common/packet_functions.cpp b/common/packet_functions.cpp index 5860f9cc8..dbd10f14f 100644 --- a/common/packet_functions.cpp +++ b/common/packet_functions.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include #include diff --git a/common/patches/patches.cpp b/common/patches/patches.cpp index b993b57dd..55c0d4e8b 100644 --- a/common/patches/patches.cpp +++ b/common/patches/patches.cpp @@ -1,5 +1,5 @@ -#include "../debug.h" +#include "../global_define.h" #include "patches.h" #include "titanium.h" diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp index c0d6b4ddf..6a575ca13 100644 --- a/common/patches/rof.cpp +++ b/common/patches/rof.cpp @@ -1,4 +1,4 @@ -#include "../debug.h" +#include "../global_define.h" #include "../eqemu_logsys.h" #include "rof.h" #include "../opcodemgr.h" diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp index bd2245dc3..0c61145d0 100644 --- a/common/patches/rof2.cpp +++ b/common/patches/rof2.cpp @@ -1,4 +1,4 @@ -#include "../debug.h" +#include "../global_define.h" #include "../eqemu_logsys.h" #include "rof2.h" #include "../opcodemgr.h" diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp index 9f318674b..eb53b333d 100644 --- a/common/patches/sod.cpp +++ b/common/patches/sod.cpp @@ -1,4 +1,4 @@ -#include "../debug.h" +#include "../global_define.h" #include "../eqemu_logsys.h" #include "sod.h" #include "../opcodemgr.h" diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp index 4337d712e..4d3c61da7 100644 --- a/common/patches/sof.cpp +++ b/common/patches/sof.cpp @@ -1,4 +1,4 @@ -#include "../debug.h" +#include "../global_define.h" #include "../eqemu_logsys.h" #include "sof.h" #include "../opcodemgr.h" diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index 852baa089..21701de7e 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -1,4 +1,4 @@ -#include "../debug.h" +#include "../global_define.h" #include "../eqemu_logsys.h" #include "titanium.h" #include "../opcodemgr.h" diff --git a/common/patches/underfoot.cpp b/common/patches/underfoot.cpp index 12f7a3354..d0ae81fb5 100644 --- a/common/patches/underfoot.cpp +++ b/common/patches/underfoot.cpp @@ -1,4 +1,4 @@ -#include "../debug.h" +#include "../global_define.h" #include "../eqemu_logsys.h" #include "underfoot.h" #include "../opcodemgr.h" diff --git a/common/perl_eqdb.cpp b/common/perl_eqdb.cpp index 8e7fb1138..2cd9fa38d 100644 --- a/common/perl_eqdb.cpp +++ b/common/perl_eqdb.cpp @@ -28,7 +28,7 @@ typedef const char Const_char; #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/useperl.h" #include "eqdb.h" diff --git a/common/perl_eqdb_res.cpp b/common/perl_eqdb_res.cpp index b4f22affb..2782a6f05 100644 --- a/common/perl_eqdb_res.cpp +++ b/common/perl_eqdb_res.cpp @@ -28,7 +28,7 @@ typedef const char Const_char; #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/useperl.h" #include "eqdb_res.h" diff --git a/common/proc_launcher.cpp b/common/proc_launcher.cpp index 36f58de86..d44cc9c46 100644 --- a/common/proc_launcher.cpp +++ b/common/proc_launcher.cpp @@ -19,7 +19,7 @@ #include #include -#include "debug.h" +#include "global_define.h" #include "types.h" #include "proc_launcher.h" #ifdef _WINDOWS diff --git a/common/proc_launcher.h b/common/proc_launcher.h index 64133481e..6289579cd 100644 --- a/common/proc_launcher.h +++ b/common/proc_launcher.h @@ -18,7 +18,7 @@ #ifndef PROCLAUNCHER_H_ #define PROCLAUNCHER_H_ -#include "debug.h" +#include "global_define.h" #include #include diff --git a/common/ptimer.cpp b/common/ptimer.cpp index 76bc41419..b41a45677 100644 --- a/common/ptimer.cpp +++ b/common/ptimer.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "debug.h" +#include "global_define.h" #include "timer.h" #include "ptimer.h" diff --git a/common/struct_strategy.cpp b/common/struct_strategy.cpp index 7c57b0d4d..49f422177 100644 --- a/common/struct_strategy.cpp +++ b/common/struct_strategy.cpp @@ -1,5 +1,5 @@ -#include "debug.h" +#include "global_define.h" #include "eqemu_logsys.h" #include "struct_strategy.h" diff --git a/common/tcp_connection.cpp b/common/tcp_connection.cpp index 58ea11822..f558d0596 100644 --- a/common/tcp_connection.cpp +++ b/common/tcp_connection.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include diff --git a/common/tcp_server.cpp b/common/tcp_server.cpp index cfde2f24e..0f9b0445c 100644 --- a/common/tcp_server.cpp +++ b/common/tcp_server.cpp @@ -1,4 +1,4 @@ -#include "debug.h" +#include "global_define.h" #include "tcp_server.h" #include "../common/eqemu_logsys.h" diff --git a/common/timeoutmgr.cpp b/common/timeoutmgr.cpp index b7be6ee98..998195cb3 100644 --- a/common/timeoutmgr.cpp +++ b/common/timeoutmgr.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" //#define TIMEOUT_DEBUG diff --git a/common/timer.h b/common/timer.h index c4d89fe11..4b2719dc6 100644 --- a/common/timer.h +++ b/common/timer.h @@ -22,7 +22,7 @@ // Disgrace: for windows compile #ifdef _WINDOWS - #include "debug.h" + #include "global_define.h" int gettimeofday (timeval *tp, ...); #endif diff --git a/common/worldconn.cpp b/common/worldconn.cpp index 81b281174..e85d24a75 100644 --- a/common/worldconn.cpp +++ b/common/worldconn.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include diff --git a/common/xml_parser.cpp b/common/xml_parser.cpp index 7f84e0d47..f252ce177 100644 --- a/common/xml_parser.cpp +++ b/common/xml_parser.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "debug.h" +#include "global_define.h" #include "xml_parser.h" XMLParser::XMLParser() { diff --git a/common/xml_parser.h b/common/xml_parser.h index f96cbb044..38ed6d254 100644 --- a/common/xml_parser.h +++ b/common/xml_parser.h @@ -18,7 +18,7 @@ #ifndef XMLParser_H #define XMLParser_H -#include "debug.h" +#include "global_define.h" #include "tinyxml/tinyxml.h" #include "../common/types.h" diff --git a/eqlaunch/eqlaunch.cpp b/eqlaunch/eqlaunch.cpp index 6af623b5f..db737e9a5 100644 --- a/eqlaunch/eqlaunch.cpp +++ b/eqlaunch/eqlaunch.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/proc_launcher.h" #include "../common/eqemu_config.h" diff --git a/eqlaunch/worldserver.cpp b/eqlaunch/worldserver.cpp index b9c7d6b91..a4b27a983 100644 --- a/eqlaunch/worldserver.cpp +++ b/eqlaunch/worldserver.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/servertalk.h" #include "../common/eqemu_config.h" diff --git a/eqlaunch/zone_launch.cpp b/eqlaunch/zone_launch.cpp index 7e211fb88..8c1e62223 100644 --- a/eqlaunch/zone_launch.cpp +++ b/eqlaunch/zone_launch.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/eqemu_config.h" #include "zone_launch.h" diff --git a/queryserv/database.cpp b/queryserv/database.cpp index b6c44f573..585417e37 100644 --- a/queryserv/database.cpp +++ b/queryserv/database.cpp @@ -18,7 +18,7 @@ */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include #include diff --git a/queryserv/database.h b/queryserv/database.h index a25d91611..adcb8c811 100644 --- a/queryserv/database.h +++ b/queryserv/database.h @@ -23,7 +23,7 @@ #define AUTHENTICATION_TIMEOUT 60 #define INVALID_ID 0xFFFFFFFF -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/types.h" #include "../common/dbcore.h" #include "../common/linked_list.h" diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp index b67d8ad4f..e227f515f 100644 --- a/queryserv/queryserv.cpp +++ b/queryserv/queryserv.cpp @@ -17,7 +17,7 @@ */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/opcodemgr.h" #include "../common/eq_stream_factory.h" diff --git a/queryserv/queryservconfig.cpp b/queryserv/queryservconfig.cpp index 0c44a7c87..716ae0618 100644 --- a/queryserv/queryservconfig.cpp +++ b/queryserv/queryservconfig.cpp @@ -17,7 +17,7 @@ */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "queryservconfig.h" queryservconfig *queryservconfig::_chat_config = nullptr; diff --git a/queryserv/worldserver.cpp b/queryserv/worldserver.cpp index 32e8756ef..2d2f288a4 100644 --- a/queryserv/worldserver.cpp +++ b/queryserv/worldserver.cpp @@ -17,7 +17,7 @@ */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/md5.h" #include "../common/packet_dump.h" diff --git a/shared_memory/base_data.cpp b/shared_memory/base_data.cpp index c473101da..086256cda 100644 --- a/shared_memory/base_data.cpp +++ b/shared_memory/base_data.cpp @@ -17,7 +17,7 @@ */ #include "base_data.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/shareddb.h" #include "../common/ipc_mutex.h" #include "../common/memory_mapped_file.h" diff --git a/shared_memory/items.cpp b/shared_memory/items.cpp index 432458701..48b81b6fc 100644 --- a/shared_memory/items.cpp +++ b/shared_memory/items.cpp @@ -17,7 +17,7 @@ */ #include "items.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/shareddb.h" #include "../common/ipc_mutex.h" #include "../common/memory_mapped_file.h" diff --git a/shared_memory/loot.cpp b/shared_memory/loot.cpp index 81c0ef5a5..66982c05a 100644 --- a/shared_memory/loot.cpp +++ b/shared_memory/loot.cpp @@ -17,7 +17,7 @@ */ #include "loot.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/shareddb.h" #include "../common/ipc_mutex.h" #include "../common/memory_mapped_file.h" diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp index ddc42cbc3..345616e8f 100644 --- a/shared_memory/main.cpp +++ b/shared_memory/main.cpp @@ -19,7 +19,7 @@ #include #include "../common/eqemu_logsys.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/shareddb.h" #include "../common/eqemu_config.h" #include "../common/platform.h" diff --git a/shared_memory/npc_faction.cpp b/shared_memory/npc_faction.cpp index 8a9575497..df33b7368 100644 --- a/shared_memory/npc_faction.cpp +++ b/shared_memory/npc_faction.cpp @@ -17,7 +17,7 @@ */ #include "npc_faction.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/shareddb.h" #include "../common/ipc_mutex.h" #include "../common/memory_mapped_file.h" diff --git a/shared_memory/skill_caps.cpp b/shared_memory/skill_caps.cpp index c8cc0838b..94205ce72 100644 --- a/shared_memory/skill_caps.cpp +++ b/shared_memory/skill_caps.cpp @@ -17,7 +17,7 @@ */ #include "skill_caps.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/shareddb.h" #include "../common/ipc_mutex.h" #include "../common/memory_mapped_file.h" diff --git a/shared_memory/spells.cpp b/shared_memory/spells.cpp index eb8f34777..444f3b466 100644 --- a/shared_memory/spells.cpp +++ b/shared_memory/spells.cpp @@ -17,7 +17,7 @@ */ #include "spells.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/shareddb.h" #include "../common/ipc_mutex.h" #include "../common/memory_mapped_file.h" diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index a518aa1a8..a643cdfa9 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -17,7 +17,7 @@ */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/string_util.h" #include "../common/eqemu_logsys.h" diff --git a/ucs/database.cpp b/ucs/database.cpp index dee5072fb..8b9d3f687 100644 --- a/ucs/database.cpp +++ b/ucs/database.cpp @@ -18,7 +18,7 @@ */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include #include diff --git a/ucs/database.h b/ucs/database.h index 382f71a43..fc9b96d19 100644 --- a/ucs/database.h +++ b/ucs/database.h @@ -23,7 +23,7 @@ #define AUTHENTICATION_TIMEOUT 60 #define INVALID_ID 0xFFFFFFFF -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/types.h" #include "../common/dbcore.h" #include "../common/linked_list.h" diff --git a/ucs/ucs.cpp b/ucs/ucs.cpp index 1bbb66c16..fd9688def 100644 --- a/ucs/ucs.cpp +++ b/ucs/ucs.cpp @@ -18,7 +18,7 @@ */ #include "../common/eqemu_logsys.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "clientlist.h" #include "../common/opcodemgr.h" #include "../common/eq_stream_factory.h" diff --git a/ucs/ucsconfig.cpp b/ucs/ucsconfig.cpp index 4f055a6af..dd8c73ab8 100644 --- a/ucs/ucsconfig.cpp +++ b/ucs/ucsconfig.cpp @@ -17,7 +17,7 @@ */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "ucsconfig.h" ucsconfig *ucsconfig::_chat_config = nullptr; diff --git a/ucs/worldserver.cpp b/ucs/worldserver.cpp index 67bc81987..395d72e59 100644 --- a/ucs/worldserver.cpp +++ b/ucs/worldserver.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include #include diff --git a/world/adventure.cpp b/world/adventure.cpp index 83b98813d..6c08204a7 100644 --- a/world/adventure.cpp +++ b/world/adventure.cpp @@ -1,4 +1,4 @@ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/servertalk.h" #include "../common/extprofile.h" #include "../common/rulesys.h" diff --git a/world/adventure.h b/world/adventure.h index dec691eda..23255a5b5 100644 --- a/world/adventure.h +++ b/world/adventure.h @@ -1,7 +1,7 @@ #ifndef ADVENTURE_H #define ADVENTURE_H -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/types.h" #include "../common/timer.h" #include "adventure_template.h" diff --git a/world/adventure_manager.cpp b/world/adventure_manager.cpp index 3f671ee97..47522ccec 100644 --- a/world/adventure_manager.cpp +++ b/world/adventure_manager.cpp @@ -1,4 +1,4 @@ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/misc_functions.h" #include "../common/string_util.h" #include "../common/servertalk.h" diff --git a/world/adventure_manager.h b/world/adventure_manager.h index ce6d7331a..5c9a4e560 100644 --- a/world/adventure_manager.h +++ b/world/adventure_manager.h @@ -1,7 +1,7 @@ #ifndef ADVENTURE_MANAGER_H #define ADVENTURE_MANAGER_H -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/types.h" #include "../common/timer.h" #include "adventure.h" diff --git a/world/adventure_template.h b/world/adventure_template.h index 86fc3d0f5..89f8b9915 100644 --- a/world/adventure_template.h +++ b/world/adventure_template.h @@ -1,7 +1,7 @@ #ifndef ADVENTURE_TEMPLATE_H #define ADVENTURE_TEMPLATE_H -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/types.h" #pragma pack(1) diff --git a/world/client.cpp b/world/client.cpp index 9b92b668e..b6f3e3153 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -1,4 +1,4 @@ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eq_packet.h" #include "../common/eq_stream_intf.h" #include "../common/misc.h" diff --git a/world/cliententry.cpp b/world/cliententry.cpp index 93adbc931..034b7ef9a 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "cliententry.h" #include "clientlist.h" #include "login_server.h" diff --git a/world/clientlist.cpp b/world/clientlist.cpp index 53f989538..b6b22a6d4 100644 --- a/world/clientlist.cpp +++ b/world/clientlist.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "clientlist.h" #include "zoneserver.h" #include "zonelist.h" diff --git a/world/console.cpp b/world/console.cpp index fbf9415bd..2194bfed4 100644 --- a/world/console.cpp +++ b/world/console.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include #include diff --git a/world/eql_config.cpp b/world/eql_config.cpp index 85f98713d..d8b60d209 100644 --- a/world/eql_config.cpp +++ b/world/eql_config.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "eql_config.h" #include "worlddb.h" #include "launcher_link.h" diff --git a/world/eqw.cpp b/world/eqw.cpp index 7ff709ec6..04d5d4c8b 100644 --- a/world/eqw.cpp +++ b/world/eqw.cpp @@ -18,7 +18,7 @@ #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "eqw.h" #include "eqw_parser.h" #include "world_config.h" diff --git a/world/eqw_http_handler.cpp b/world/eqw_http_handler.cpp index 36fdf714c..c30620747 100644 --- a/world/eqw_http_handler.cpp +++ b/world/eqw_http_handler.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "eqw_http_handler.h" #include "../common/SocketLib/Base64.h" #include "eqw_parser.h" diff --git a/world/eqw_parser.cpp b/world/eqw_parser.cpp index e7b72bf38..79e73ac22 100644 --- a/world/eqw_parser.cpp +++ b/world/eqw_parser.cpp @@ -20,7 +20,7 @@ #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "eqw_parser.h" #include "eqw.h" #include "../common/eqdb.h" diff --git a/world/http_request.cpp b/world/http_request.cpp index fa7bc78f1..af4b6c9b2 100644 --- a/world/http_request.cpp +++ b/world/http_request.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "http_request.h" #include "eqw_http_handler.h" #include "../common/eqdb.h" diff --git a/world/launcher_link.cpp b/world/launcher_link.cpp index 9e8db6ea1..bd8bfdc4b 100644 --- a/world/launcher_link.cpp +++ b/world/launcher_link.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "launcher_link.h" #include "launcher_list.h" #include "world_config.h" diff --git a/world/launcher_list.cpp b/world/launcher_list.cpp index 01f64bfec..62657175a 100644 --- a/world/launcher_list.cpp +++ b/world/launcher_list.cpp @@ -17,7 +17,7 @@ */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "launcher_list.h" #include "launcher_link.h" diff --git a/world/login_server.cpp b/world/login_server.cpp index f411e7a72..450ecb0a3 100644 --- a/world/login_server.cpp +++ b/world/login_server.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include #include diff --git a/world/login_server_list.cpp b/world/login_server_list.cpp index e76b38b71..6104f4f0a 100644 --- a/world/login_server_list.cpp +++ b/world/login_server_list.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include #include diff --git a/world/net.cpp b/world/net.cpp index 529643d08..a4e560477 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include @@ -24,7 +24,7 @@ #include -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/queue.h" #include "../common/timer.h" diff --git a/world/perl_eql_config.cpp b/world/perl_eql_config.cpp index 19ea7c9f6..7cd7d0e2a 100644 --- a/world/perl_eql_config.cpp +++ b/world/perl_eql_config.cpp @@ -28,7 +28,7 @@ typedef const char Const_char; #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "eqw_parser.h" #include "eql_config.h" diff --git a/world/perl_eqw.cpp b/world/perl_eqw.cpp index 0a564164d..675eac26c 100644 --- a/world/perl_eqw.cpp +++ b/world/perl_eqw.cpp @@ -28,7 +28,7 @@ typedef const char Const_char; #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "eqw_parser.h" #include "eqw.h" diff --git a/world/perl_http_request.cpp b/world/perl_http_request.cpp index 12d70002c..cdd7e60f1 100644 --- a/world/perl_http_request.cpp +++ b/world/perl_http_request.cpp @@ -28,7 +28,7 @@ typedef const char Const_char; #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "eqw_parser.h" #include "http_request.h" diff --git a/world/queryserv.cpp b/world/queryserv.cpp index 171dcaa13..bf1af1e2e 100644 --- a/world/queryserv.cpp +++ b/world/queryserv.cpp @@ -1,4 +1,4 @@ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "queryserv.h" #include "world_config.h" diff --git a/world/ucs.cpp b/world/ucs.cpp index 4f9827a36..e15007959 100644 --- a/world/ucs.cpp +++ b/world/ucs.cpp @@ -1,4 +1,4 @@ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "ucs.h" #include "world_config.h" diff --git a/world/wguild_mgr.cpp b/world/wguild_mgr.cpp index 1b7f8739e..b2750ded2 100644 --- a/world/wguild_mgr.cpp +++ b/world/wguild_mgr.cpp @@ -17,7 +17,7 @@ */ #include "../common/eqemu_logsys.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "wguild_mgr.h" #include "../common/servertalk.h" #include "clientlist.h" diff --git a/world/world_config.cpp b/world/world_config.cpp index 2f9464e13..f57368a10 100644 --- a/world/world_config.cpp +++ b/world/world_config.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "world_config.h" WorldConfig *WorldConfig::_world_config = nullptr; diff --git a/world/zonelist.cpp b/world/zonelist.cpp index 52879cafa..22d783f5d 100644 --- a/world/zonelist.cpp +++ b/world/zonelist.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "zonelist.h" #include "zoneserver.h" #include "world_tcp_connection.h" diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index de3f34435..d8909dbd8 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "zoneserver.h" #include "clientlist.h" #include "login_server.h" diff --git a/zone/aa.cpp b/zone/aa.cpp index 5b3b82732..b6a1917b9 100644 --- a/zone/aa.cpp +++ b/zone/aa.cpp @@ -17,7 +17,7 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) */ #include "../common/classes.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/eq_packet_structs.h" #include "../common/races.h" diff --git a/zone/aggro.cpp b/zone/aggro.cpp index d0b688e29..d49702146 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/faction.h" #include "../common/rulesys.h" diff --git a/zone/attack.cpp b/zone/attack.cpp index ce97ae524..d304bf7b3 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eq_constants.h" #include "../common/eq_packet_structs.h" #include "../common/rulesys.h" diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index fcb7f0ef9..9af1d623d 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/classes.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/item.h" #include "../common/rulesys.h" #include "../common/skills.h" diff --git a/zone/bot.h b/zone/bot.h index 40b505c84..42e041861 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -12,7 +12,7 @@ #include "zonedb.h" #include "string_ids.h" #include "../common/misc_functions.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "guild_mgr.h" #include "worldserver.h" diff --git a/zone/client.cpp b/zone/client.cpp index c0f9ff64b..50ac4655c 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include #include diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp index fc49e1526..0bd54308f 100644 --- a/zone/client_mods.cpp +++ b/zone/client_mods.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/rulesys.h" diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 20f58cc12..6ecfae636 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -15,7 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/opcodemgr.h" #include diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 483dceac1..c60c17298 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -20,7 +20,7 @@ */ #include "../common/eqemu_logsys.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include #include #include diff --git a/zone/command.cpp b/zone/command.cpp index fe8d3d9fd..47f5517ab 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -42,7 +42,7 @@ #define strcasecmp _stricmp #endif -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eq_packet.h" #include "../common/features.h" #include "../common/guilds.h" diff --git a/zone/corpse.cpp b/zone/corpse.cpp index 81d77651f..b42906d20 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -28,7 +28,7 @@ Child of the Mob class. #define strcasecmp _stricmp #endif -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/rulesys.h" #include "../common/string_util.h" diff --git a/zone/doors.cpp b/zone/doors.cpp index 227c8c7af..76ecb53fc 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/string_util.h" diff --git a/zone/effects.cpp b/zone/effects.cpp index 8ec921ae3..ba5b42f1c 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/spdat.h" diff --git a/zone/embparser.cpp b/zone/embparser.cpp index e18dcfd39..72b15e118 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -18,7 +18,7 @@ #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/seperator.h" #include "../common/misc_functions.h" #include "../common/string_util.h" diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index 99698fe72..e5188eae3 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -21,7 +21,7 @@ #ifdef EMBPERL #ifdef EMBPERL_XS -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/misc_functions.h" #include "embparser.h" diff --git a/zone/embperl.cpp b/zone/embperl.cpp index 167e92711..4d27d1269 100644 --- a/zone/embperl.cpp +++ b/zone/embperl.cpp @@ -10,7 +10,7 @@ Eglin #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include #include diff --git a/zone/embxs.cpp b/zone/embxs.cpp index 5e387022e..4c0e8211c 100644 --- a/zone/embxs.cpp +++ b/zone/embxs.cpp @@ -17,7 +17,7 @@ */ #ifdef EMBPERL -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "masterentity.h" #include "command.h" diff --git a/zone/entity.cpp b/zone/entity.cpp index ec2be21f5..2ded575c0 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include #include diff --git a/zone/exp.cpp b/zone/exp.cpp index 53f015b8a..7eb2189df 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/features.h" #include "../common/rulesys.h" #include "../common/string_util.h" diff --git a/zone/forage.cpp b/zone/forage.cpp index 427f28b10..db348cf8c 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/misc_functions.h" #include "../common/rulesys.h" diff --git a/zone/groups.cpp b/zone/groups.cpp index d1a310c92..6fbd08c15 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "masterentity.h" #include "npc_ai.h" diff --git a/zone/horse.cpp b/zone/horse.cpp index cfc0174d2..91e452dc2 100644 --- a/zone/horse.cpp +++ b/zone/horse.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/linked_list.h" #include "../common/string_util.h" diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 56ad5e904..ab753f1e4 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/string_util.h" diff --git a/zone/loottables.cpp b/zone/loottables.cpp index 16f5af7b0..39caafcea 100644 --- a/zone/loottables.cpp +++ b/zone/loottables.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/loottable.h" #include "../common/misc_functions.h" diff --git a/zone/map.cpp b/zone/map.cpp index 5c917b955..941292acd 100644 --- a/zone/map.cpp +++ b/zone/map.cpp @@ -1,4 +1,4 @@ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/misc_functions.h" #include "map.h" diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp index a77335016..67b8d4480 100644 --- a/zone/mob_ai.cpp +++ b/zone/mob_ai.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/features.h" #include "../common/rulesys.h" #include "../common/string_util.h" diff --git a/zone/net.cpp b/zone/net.cpp index 078f9cdd7..579f9d342 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -19,7 +19,7 @@ #define DONT_SHARED_OPCODES #define PLATFORM_ZONE 1 -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/features.h" #include "../common/queue.h" #include "../common/timer.h" diff --git a/zone/npc.cpp b/zone/npc.cpp index 4700159ec..4b749adba 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -18,7 +18,7 @@ #include "../common/bodytypes.h" #include "../common/classes.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/misc_functions.h" #include "../common/rulesys.h" #include "../common/seperator.h" diff --git a/zone/object.cpp b/zone/object.cpp index baa084699..09988481e 100644 --- a/zone/object.cpp +++ b/zone/object.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/string_util.h" #include "client.h" diff --git a/zone/pathing.cpp b/zone/pathing.cpp index 6afa63546..86d1e23a2 100644 --- a/zone/pathing.cpp +++ b/zone/pathing.cpp @@ -1,4 +1,4 @@ -#include "../common/debug.h" +#include "../common/global_define.h" #include "client.h" #include "doors.h" diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index 685a39091..e47e17cfd 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perl_doors.cpp b/zone/perl_doors.cpp index 77ad1902b..c8f6ad221 100644 --- a/zone/perl_doors.cpp +++ b/zone/perl_doors.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perl_entity.cpp b/zone/perl_entity.cpp index 3d685e011..9b8718086 100644 --- a/zone/perl_entity.cpp +++ b/zone/perl_entity.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include #include "embperl.h" diff --git a/zone/perl_groups.cpp b/zone/perl_groups.cpp index 9db01353b..6960d14df 100644 --- a/zone/perl_groups.cpp +++ b/zone/perl_groups.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perl_hateentry.cpp b/zone/perl_hateentry.cpp index 6e8b2de9e..7c346a748 100644 --- a/zone/perl_hateentry.cpp +++ b/zone/perl_hateentry.cpp @@ -19,7 +19,7 @@ #include "../common/features.h" #include "client.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp index af07cfcdf..ac76beafe 100644 --- a/zone/perl_mob.cpp +++ b/zone/perl_mob.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perl_npc.cpp b/zone/perl_npc.cpp index 279b64330..c334ddb1b 100644 --- a/zone/perl_npc.cpp +++ b/zone/perl_npc.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perl_object.cpp b/zone/perl_object.cpp index 036d555a1..be52fef1d 100644 --- a/zone/perl_object.cpp +++ b/zone/perl_object.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perl_perlpacket.cpp b/zone/perl_perlpacket.cpp index 4a9c70464..f23cf36d7 100644 --- a/zone/perl_perlpacket.cpp +++ b/zone/perl_perlpacket.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/types.h" #include "embperl.h" diff --git a/zone/perl_player_corpse.cpp b/zone/perl_player_corpse.cpp index 675ee9697..a417284c8 100644 --- a/zone/perl_player_corpse.cpp +++ b/zone/perl_player_corpse.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perl_questitem.cpp b/zone/perl_questitem.cpp index 4c93d8839..158ee64a4 100644 --- a/zone/perl_questitem.cpp +++ b/zone/perl_questitem.cpp @@ -19,7 +19,7 @@ #include "../common/features.h" #include "client.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perl_raids.cpp b/zone/perl_raids.cpp index be3aea356..60d94600a 100644 --- a/zone/perl_raids.cpp +++ b/zone/perl_raids.cpp @@ -27,7 +27,7 @@ #include "../common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/debug.h" +#include "../common/global_define.h" #include "embperl.h" #ifdef seed diff --git a/zone/perlpacket.cpp b/zone/perlpacket.cpp index 1475ff448..ed0dd9cd3 100644 --- a/zone/perlpacket.cpp +++ b/zone/perlpacket.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include "perlpacket.h" #include "client.h" diff --git a/zone/petitions.cpp b/zone/petitions.cpp index 2d2173e26..4af99a946 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -15,7 +15,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include #ifdef _WINDOWS diff --git a/zone/pets.cpp b/zone/pets.cpp index 1171194e3..829f8b020 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/spdat.h" #include "../common/string_util.h" #include "../common/types.h" diff --git a/zone/queryserv.cpp b/zone/queryserv.cpp index 1186aa241..d67ca46c7 100644 --- a/zone/queryserv.cpp +++ b/zone/queryserv.cpp @@ -16,7 +16,7 @@ Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net) Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/servertalk.h" #include "../common/string_util.h" #include "queryserv.h" diff --git a/zone/quest_parser_collection.cpp b/zone/quest_parser_collection.cpp index d3bde0d5b..bb3c55f3f 100644 --- a/zone/quest_parser_collection.cpp +++ b/zone/quest_parser_collection.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/misc_functions.h" #include "../common/features.h" diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index d9eb291dc..f99aff8bc 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -17,7 +17,7 @@ */ #include "../common/classes.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index 0f8b3330d..dfaa90278 100644 --- a/zone/spawn2.cpp +++ b/zone/spawn2.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/string_util.h" #include "client.h" diff --git a/zone/spawngroup.cpp b/zone/spawngroup.cpp index bae4832c0..1661e0fe8 100644 --- a/zone/spawngroup.cpp +++ b/zone/spawngroup.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/string_util.h" #include "../common/types.h" diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index b45f7da70..65f318c46 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -19,7 +19,7 @@ #include "../common/eqemu_logsys.h" #include "../common/bodytypes.h" #include "../common/classes.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/item.h" #include "../common/rulesys.h" #include "../common/skills.h" diff --git a/zone/spells.cpp b/zone/spells.cpp index a9bc59f15..c9d21201e 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -68,7 +68,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #include "../common/bodytypes.h" #include "../common/classes.h" -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/item.h" #include "../common/rulesys.h" diff --git a/zone/tasks.cpp b/zone/tasks.cpp index e20e71f4c..37255179b 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -17,7 +17,7 @@ Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "tasks.h" #include diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index d923af5c6..0e012d087 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include diff --git a/zone/trading.cpp b/zone/trading.cpp index 0fd36ad37..e2824cb62 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/rulesys.h" #include "../common/string_util.h" diff --git a/zone/tribute.cpp b/zone/tribute.cpp index 7fbd52e1d..6b104c5f2 100644 --- a/zone/tribute.cpp +++ b/zone/tribute.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eq_packet_structs.h" #include "../common/features.h" diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index 95f655cbb..95c76d66b 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #ifdef _EQDEBUG #include #endif diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index d08384515..f305133dd 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include #include #include diff --git a/zone/zone.cpp b/zone/zone.cpp index ecfdb4cef..49595914f 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -30,7 +30,7 @@ #include "../common/unix.h" #endif -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/features.h" #include "../common/rulesys.h" #include "../common/seperator.h" diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 53235176b..18eca56cb 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/rulesys.h" #include "../common/string_util.h"