From 7fc21b9e3a546c36ba53c3ea15581fc3b1c20ad9 Mon Sep 17 00:00:00 2001 From: KimLS Date: Thu, 21 Aug 2014 19:33:02 -0700 Subject: [PATCH] Tons of renames --- client_files/export/main.cpp | 2 +- client_files/import/main.cpp | 2 +- common/CMakeLists.txt | 201 +- common/EQNetwork.cpp | 405 ---- common/EQNetwork.h | 120 -- common/MaxSkill.cpp | 1900 ----------------- common/SocketLib/HTTPSocket.cpp | 2 +- common/SocketLib/HTTPSocket.h | 2 +- common/database.cpp | 2 +- common/database.h | 6 +- common/dbasync.cpp | 4 +- common/dbcore.cpp | 2 +- common/dbcore.h | 2 +- common/debug.cpp | 4 +- common/emu_tcp_connection.h | 2 +- common/emu_tcp_server.h | 2 +- common/eq_dictionary.cpp | 2 +- common/eq_dictionary.h | 14 +- common/eq_packet.cpp | 2 +- common/{EQPacket.h => eq_packet.h} | 2 +- common/eq_stream.cpp | 4 +- common/{EQStream.h => eq_stream.h} | 6 +- common/eq_stream_factory.cpp | 4 +- ...{EQStreamFactory.h => eq_stream_factory.h} | 2 +- common/eq_stream_ident.cpp | 4 +- common/{EQStreamIdent.h => eq_stream_ident.h} | 2 +- common/{EQStreamIntf.h => eq_stream_intf.h} | 0 ...{EQStreamLocator.h => eq_stream_locator.h} | 0 common/eq_stream_proxy.cpp | 6 +- common/{EQStreamProxy.h => eq_stream_proxy.h} | 2 +- common/{EQStreamType.h => eq_stream_type.h} | 0 common/eqemu_config.cpp | 2 +- common/eqemu_config.h | 2 +- common/eqemu_error.cpp | 4 +- common/{EQEMuError.h => eqemu_error.h} | 0 common/extprofile.h | 2 +- common/guild_base.cpp | 4 +- common/guilds.cpp | 2 +- common/item.cpp | 4 +- common/{Item.h => item.h} | 0 common/logsys.cpp | 2 +- common/logsys_eqemu.cpp | 2 +- common/md5.cpp | 2 +- common/misc_functions.cpp | 2 +- common/{MiscFunctions.h => misc_functions.h} | 0 common/mysql_request_result.cpp | 2 +- ...RequestResult.h => mysql_request_result.h} | 2 +- common/mysql_request_row.cpp | 2 +- ...{MySQLRequestRow.h => mysql_request_row.h} | 0 common/packet_dump.cpp | 2 +- common/packet_dump_file.cpp | 2 +- common/patches/client62.cpp | 22 +- common/patches/{Client62.h => client62.h} | 8 +- ...ent62_constants.h => client62_constants.h} | 0 ...t62_itemfields.h => client62_itemfields.h} | 0 .../{Client62_ops.h => client62_ops.h} | 0 ...{Client62_structs.h => client62_structs.h} | 0 common/patches/patches.cpp | 14 +- common/patches/rof.cpp | 18 +- common/patches/{RoF.h => rof.h} | 6 +- .../{RoF_constants.h => rof_constants.h} | 0 .../{RoF_itemfields.h => rof_itemfields.h} | 0 common/patches/{RoF_ops.h => rof_ops.h} | 0 .../patches/{RoF_structs.h => rof_structs.h} | 0 common/patches/sod.cpp | 18 +- common/patches/{SoD.h => sod.h} | 6 +- .../{SoD_constants.h => sod_constants.h} | 0 .../{SoD_itemfields.h => sod_itemfields.h} | 0 common/patches/{SoD_ops.h => sod_ops.h} | 0 .../patches/{SoD_structs.h => sod_structs.h} | 0 common/patches/sof.cpp | 16 +- common/patches/{SoF.h => sof.h} | 6 +- .../{SoF_constants.h => sof_constants.h} | 0 .../{SoF_itemfields.h => sof_itemfields.h} | 0 common/patches/{SoF_ops.h => sof_ops.h} | 0 .../patches/{SoF_structs.h => sof_structs.h} | 0 common/patches/{SSDeclare.h => ss_declare.h} | 0 common/patches/{SSDefine.h => ss_define.h} | 0 .../patches/{SSRegister.h => ss_register.h} | 0 common/patches/template.cpp | 6 +- common/patches/template.h | 4 +- common/patches/titanium.cpp | 20 +- common/patches/{Titanium.h => titanium.h} | 6 +- ...anium_constants.h => titanium_constants.h} | 0 ...ium_itemfields.h => titanium_itemfields.h} | 0 .../{Titanium_ops.h => titanium_ops.h} | 0 ...{Titanium_structs.h => titanium_structs.h} | 0 common/patches/underfoot.cpp | 18 +- common/patches/{Underfoot.h => underfoot.h} | 6 +- ...foot_constants.h => underfoot_constants.h} | 0 ...ot_itemfields.h => underfoot_itemfields.h} | 0 .../{Underfoot_ops.h => underfoot_ops.h} | 0 ...nderfoot_structs.h => underfoot_structs.h} | 0 common/proc_launcher.cpp | 2 +- common/{ProcLauncher.h => proc_launcher.h} | 0 common/ptimer.cpp | 2 +- common/rulesys.cpp | 2 +- common/shareddb.cpp | 4 +- common/shareddb.h | 2 +- common/spdat.cpp | 2 +- common/string_util.cpp | 2 +- common/{StringUtil.h => string_util.h} | 0 common/struct_strategy.cpp | 4 +- .../{StructStrategy.h => struct_strategy.h} | 0 .../{TCPBasicServer.h => tcp_basic_server.h} | 4 +- common/tcp_connection.cpp | 2 +- common/{TCPConnection.h => tcp_connection.h} | 2 +- common/tcp_server.cpp | 2 +- common/{TCPServer.h => tcp_server.h} | 0 common/xml_parser.cpp | 2 +- common/{XMLParser.h => xml_parser.h} | 0 common/{ZoneNumbers.h => zone_numbers.h} | 0 eqlaunch/ZoneLaunch.h | 2 +- eqlaunch/eqlaunch.cpp | 2 +- eqlaunch/worldserver.cpp | 2 +- loginserver/Client.cpp | 2 +- loginserver/Client.h | 4 +- loginserver/ClientManager.h | 4 +- loginserver/Main.cpp | 2 +- loginserver/ServerManager.h | 2 +- loginserver/WorldServer.h | 2 +- queryserv/database.cpp | 2 +- queryserv/lfguild.cpp | 2 +- queryserv/queryserv.cpp | 2 +- socket_server/database.cpp | 2 +- socket_server/socket_server.cpp | 2 +- tests/atobool_test.h | 2 +- tests/fixed_memory_test.h | 2 +- tests/hextoi_32_64_test.h | 2 +- ucs/chatchannel.cpp | 2 +- ucs/clientlist.cpp | 4 +- ucs/clientlist.h | 4 +- ucs/database.cpp | 4 +- ucs/ucs.cpp | 2 +- .../player_profile_set/MiscFunctions.cpp | 2 +- .../player_profile_set/database.h | 2 +- world/Adventure.cpp | 4 +- world/AdventureManager.cpp | 4 +- world/CMakeLists.txt | 2 +- world/EQLConfig.cpp | 2 +- world/EQW.cpp | 2 +- world/EQWHTTPHandler.h | 4 +- world/LauncherLink.cpp | 2 +- world/LoginServer.cpp | 2 +- world/client.cpp | 12 +- world/client.h | 2 +- world/cliententry.cpp | 2 +- world/clientlist.cpp | 2 +- world/console.cpp | 4 +- world/lfplist.cpp | 2 +- world/net.cpp | 13 +- world/world_logsys.cpp | 2 +- world/worlddb.cpp | 8 +- world/worlddb.h | 2 +- world/zonelist.cpp | 2 +- world/zoneserver.cpp | 2 +- zone/AA.cpp | 2 +- zone/MobAI.cpp | 4 +- zone/Object.cpp | 4 +- zone/QGlobals.cpp | 2 +- zone/QuestParserCollection.cpp | 2 +- zone/QuestParserCollection.h | 2 +- zone/aggro.cpp | 2 +- zone/attack.cpp | 2 +- zone/bonuses.cpp | 2 +- zone/bot.cpp | 2 +- zone/bot.h | 2 +- zone/botspellsai.cpp | 2 +- zone/client.cpp | 4 +- zone/client.h | 6 +- zone/client_mods.cpp | 2 +- zone/client_packet.cpp | 4 +- zone/client_process.cpp | 2 +- zone/command.cpp | 4 +- zone/command.h | 2 +- zone/corpse.cpp | 2 +- zone/doors.cpp | 2 +- zone/effects.cpp | 2 +- zone/embparser.cpp | 4 +- zone/embparser_api.cpp | 2 +- zone/exp.cpp | 2 +- zone/fearpath.cpp | 2 +- zone/forage.cpp | 4 +- zone/groups.cpp | 2 +- zone/guild.cpp | 4 +- zone/guild_mgr.cpp | 2 +- zone/hate_list.cpp | 2 +- zone/horse.cpp | 4 +- zone/inventory.cpp | 4 +- zone/loottables.cpp | 2 +- zone/lua_parser_events.cpp | 2 +- zone/map.cpp | 2 +- zone/merc.cpp | 4 +- zone/mob.cpp | 2 +- zone/net.cpp | 12 +- zone/npc.cpp | 4 +- zone/object.h | 2 +- zone/oldcode.cpp | 4 +- zone/pathing.cpp | 2 +- zone/perl_questitem.cpp | 2 +- zone/perlpacket.cpp | 2 +- zone/petitions.cpp | 2 +- zone/petitions.h | 2 +- zone/pets.cpp | 4 +- zone/questmgr.cpp | 2 +- zone/raids.cpp | 2 +- zone/spawn2.cpp | 2 +- zone/spawngroup.cpp | 4 +- zone/special_attacks.cpp | 2 +- zone/spell_effects.cpp | 2 +- zone/spells.cpp | 4 +- zone/tasks.cpp | 4 +- zone/titles.cpp | 2 +- zone/tradeskills.cpp | 4 +- zone/trading.cpp | 2 +- zone/trap.cpp | 4 +- zone/tribute.cpp | 2 +- zone/waypoints.cpp | 4 +- zone/worldserver.cpp | 2 +- zone/zone.cpp | 6 +- zone/zonedb.cpp | 4 +- zone/zonedbasync.cpp | 2 +- zone/zonedump.h | 2 +- zone/zoning.cpp | 2 +- 224 files changed, 424 insertions(+), 2857 deletions(-) delete mode 100644 common/EQNetwork.cpp delete mode 100644 common/EQNetwork.h delete mode 100644 common/MaxSkill.cpp rename common/{EQPacket.h => eq_packet.h} (99%) rename common/{EQStream.h => eq_stream.h} (99%) rename common/{EQStreamFactory.h => eq_stream_factory.h} (97%) rename common/{EQStreamIdent.h => eq_stream_ident.h} (97%) rename common/{EQStreamIntf.h => eq_stream_intf.h} (100%) rename common/{EQStreamLocator.h => eq_stream_locator.h} (100%) rename common/{EQStreamProxy.h => eq_stream_proxy.h} (98%) rename common/{EQStreamType.h => eq_stream_type.h} (100%) rename common/{EQEMuError.h => eqemu_error.h} (100%) rename common/{Item.h => item.h} (100%) rename common/{MiscFunctions.h => misc_functions.h} (100%) rename common/{MySQLRequestResult.h => mysql_request_result.h} (98%) rename common/{MySQLRequestRow.h => mysql_request_row.h} (100%) rename common/patches/{Client62.h => client62.h} (84%) rename common/patches/{Client62_constants.h => client62_constants.h} (100%) rename common/patches/{Client62_itemfields.h => client62_itemfields.h} (100%) rename common/patches/{Client62_ops.h => client62_ops.h} (100%) rename common/patches/{Client62_structs.h => client62_structs.h} (100%) rename common/patches/{RoF.h => rof.h} (87%) rename common/patches/{RoF_constants.h => rof_constants.h} (100%) rename common/patches/{RoF_itemfields.h => rof_itemfields.h} (100%) rename common/patches/{RoF_ops.h => rof_ops.h} (100%) rename common/patches/{RoF_structs.h => rof_structs.h} (100%) rename common/patches/{SoD.h => sod.h} (87%) rename common/patches/{SoD_constants.h => sod_constants.h} (100%) rename common/patches/{SoD_itemfields.h => sod_itemfields.h} (100%) rename common/patches/{SoD_ops.h => sod_ops.h} (100%) rename common/patches/{SoD_structs.h => sod_structs.h} (100%) rename common/patches/{SoF.h => sof.h} (87%) rename common/patches/{SoF_constants.h => sof_constants.h} (100%) rename common/patches/{SoF_itemfields.h => sof_itemfields.h} (100%) rename common/patches/{SoF_ops.h => sof_ops.h} (100%) rename common/patches/{SoF_structs.h => sof_structs.h} (100%) rename common/patches/{SSDeclare.h => ss_declare.h} (100%) rename common/patches/{SSDefine.h => ss_define.h} (100%) rename common/patches/{SSRegister.h => ss_register.h} (100%) rename common/patches/{Titanium.h => titanium.h} (87%) rename common/patches/{Titanium_constants.h => titanium_constants.h} (100%) rename common/patches/{Titanium_itemfields.h => titanium_itemfields.h} (100%) rename common/patches/{Titanium_ops.h => titanium_ops.h} (100%) rename common/patches/{Titanium_structs.h => titanium_structs.h} (100%) rename common/patches/{Underfoot.h => underfoot.h} (87%) rename common/patches/{Underfoot_constants.h => underfoot_constants.h} (100%) rename common/patches/{Underfoot_itemfields.h => underfoot_itemfields.h} (100%) rename common/patches/{Underfoot_ops.h => underfoot_ops.h} (100%) rename common/patches/{Underfoot_structs.h => underfoot_structs.h} (100%) rename common/{ProcLauncher.h => proc_launcher.h} (100%) rename common/{StringUtil.h => string_util.h} (100%) rename common/{StructStrategy.h => struct_strategy.h} (100%) rename common/{TCPBasicServer.h => tcp_basic_server.h} (89%) rename common/{TCPConnection.h => tcp_connection.h} (99%) rename common/{TCPServer.h => tcp_server.h} (100%) rename common/{XMLParser.h => xml_parser.h} (100%) rename common/{ZoneNumbers.h => zone_numbers.h} (100%) diff --git a/client_files/export/main.cpp b/client_files/export/main.cpp index b5669338e..c4faa4718 100644 --- a/client_files/export/main.cpp +++ b/client_files/export/main.cpp @@ -23,7 +23,7 @@ #include "../../common/platform.h" #include "../../common/crash.h" #include "../../common/rulesys.h" -#include "../../common/StringUtil.h" +#include "../../common/string_util.h" void ExportSpells(SharedDatabase *db); void ExportSkillCaps(SharedDatabase *db); diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp index 3a0968d92..9683e3bfe 100644 --- a/client_files/import/main.cpp +++ b/client_files/import/main.cpp @@ -22,7 +22,7 @@ #include "../../common/platform.h" #include "../../common/crash.h" #include "../../common/rulesys.h" -#include "../../common/StringUtil.h" +#include "../../common/string_util.h" void ImportSpells(SharedDatabase *db); void ImportSkillCaps(SharedDatabase *db); diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index f15e57c51..ccea68596 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -119,15 +119,15 @@ SET(common_headers eqemu_exception.h eqemu_config.h eqemu_config_elements.h - EQEMuError.h - EQPacket.h - EQStream.h - EQStreamFactory.h - EQStreamIdent.h - EQStreamIntf.h - EQStreamLocator.h - EQStreamProxy.h - EQStreamType.h + eqemu_error.h + eq_packet.h + eq_stream.h + eq_stream_factory.h + eq_stream_ident.h + eq_stream_intf.h + eq_stream_locator.h + eq_stream_proxy.h + eq_stream_type.h eqtime.h errmsg.h extprofile.h @@ -138,7 +138,7 @@ SET(common_headers guild_base.h guilds.h ipc_mutex.h - Item.h + item.h item_fieldlist.h item_struct.h languages.h @@ -150,18 +150,19 @@ SET(common_headers md5.h memory_mapped_file.h misc.h - MiscFunctions.h + misc_functions.h moremath.h Mutex.h - MySQLRequestResult.h - MySQLRequestRow.h + mysql_request_result.h + mysql_request_row.h op_codes.h opcode_dispatch.h opcodemgr.h packet_dump.h packet_dump_file.h packet_functions.h - ProcLauncher.h + platform.h + proc_launcher.h profiler.h ptimer.h queue.h @@ -175,11 +176,11 @@ SET(common_headers shareddb.h skills.h spdat.h - StringUtil.h - StructStrategy.h - TCPBasicServer.h - TCPConnection.h - TCPServer.h + string_util.h + struct_strategy.h + tcp_basic_server.h + tcp_connection.h + tcp_server.h timeoutmgr.h timer.h types.h @@ -187,44 +188,43 @@ SET(common_headers useperl.h version.h worldconn.h - XMLParser.h - ZoneNumbers.h - platform.h - patches/Client62.h - patches/Client62_constants.h - patches/Client62_itemfields.h - patches/Client62_ops.h - patches/Client62_structs.h + xml_parser.h + zone_numbers.h + patches/client62.h + patches/client62_constants.h + patches/client62_itemfields.h + patches/client62_ops.h + patches/client62_structs.h patches/patches.h - patches/SoD.h - patches/SoD_constants.h - patches/SoD_itemfields.h - patches/SoD_ops.h - patches/SoD_structs.h - patches/SoF.h - patches/SoF_constants.h - patches/SoF_itemfields.h - patches/SoF_opcode_list.h - patches/SoF_ops.h - patches/SoF_structs.h - patches/SSDeclare.h - patches/SSDefine.h - patches/SSRegister.h - patches/RoF.h - patches/RoF_constants.h - patches/RoF_itemfields.h - patches/RoF_ops.h - patches/RoF_structs.h - patches/Titanium.h - patches/Titanium_constants.h - patches/Titanium_itemfields.h - patches/Titanium_ops.h - patches/Titanium_structs.h - patches/Underfoot.h - patches/Underfoot_constants.h - patches/Underfoot_itemfields.h - patches/Underfoot_ops.h - patches/Underfoot_structs.h + patches/sod.h + patches/sod_constants.h + patches/sod_itemfields.h + patches/sod_ops.h + patches/sod_structs.h + patches/sof.h + patches/sof_constants.h + patches/sof_itemfields.h + patches/sof_opcode_list.h + patches/sof_ops.h + patches/sof_structs.h + patches/ss_declare.h + patches/ss_define.h + patches/ss_register.h + patches/rof.h + patches/rof_constants.h + patches/rof_itemfields.h + patches/rof_ops.h + patches/rof_structs.h + patches/titanium.h + patches/titanium_constants.h + patches/titanium_itemfields.h + patches/titanium_ops.h + patches/titanium_structs.h + patches/underfoot.h + patches/underfoot_constants.h + patches/underfoot_itemfields.h + patches/underfoot_ops.h + patches/underfoot_structs.h SocketLib/Base64.h SocketLib/File.h SocketLib/HttpdCookies.h @@ -243,54 +243,48 @@ SET(common_headers ) SOURCE_GROUP(Patches FILES - patches/Client62.h - patches/Client62_itemfields.h - patches/Client62_ops.h - patches/Client62_constants.h - patches/Client62_structs.h + patches/client62.h + patches/client62_itemfields.h + patches/client62_ops.h + patches/client62_constants.h + patches/client62_structs.h patches/patches.h - patches/SoD.h - patches/SoD_itemfields.h - patches/SoD_ops.h - patches/SoD_constants.h - patches/SoD_structs.h - patches/SoF.h - patches/SoF_itemfields.h - patches/SoF_opcode_list.h - patches/SoF_ops.h - patches/SoF_constants.h - patches/SoF_structs.h - patches/SSDeclare.h - patches/SSDefine.h - patches/SSRegister.h - patches/RoF.h - patches/RoF_itemfields.h - patches/RoF_ops.h - patches/RoF_constants.h - patches/RoF_structs.h - #patches/RoF2.h - #patches/RoF2_itemfields.h - #patches/RoF2_ops.h - #patches/RoF2_constants.h - #patches/RoF2_structs.h - patches/Titanium.h - patches/Titanium_itemfields.h - patches/Titanium_ops.h - patches/Titanium_constants.h - patches/Titanium_structs.h - patches/Underfoot.h - patches/Underfoot_itemfields.h - patches/Underfoot_ops.h - patches/Underfoot_constants.h - patches/Underfoot_structs.h - patches/Client62.cpp + patches/sod.h + patches/sod_itemfields.h + patches/sod_ops.h + patches/sod_constants.h + patches/sod_structs.h + patches/sof.h + patches/sof_itemfields.h + patches/sof_opcode_list.h + patches/sof_ops.h + patches/sof_constants.h + patches/sof_structs.h + patches/ss_declare.h + patches/ss_define.h + patches/ss_register.h + patches/rof.h + patches/rof_itemfields.h + patches/rof_ops.h + patches/rof_constants.h + patches/rof_structs.h + patches/titanium.h + patches/titanium_itemfields.h + patches/titanium_ops.h + patches/titanium_constants.h + patches/titanium_structs.h + patches/underfoot.h + patches/underfoot_itemfields.h + patches/underfoot_ops.h + patches/underfoot_constants.h + patches/underfoot_structs.h + patches/client62.cpp patches/patches.cpp - patches/SoD.cpp - patches/SoF.cpp - patches/RoF.cpp - #patches/RoF2.cpp - patches/Titanium.cpp - patches/Underfoot.cpp + patches/sod.cpp + patches/sof.cpp + patches/rof.cpp + patches/titanium.cpp + patches/underfoot.cpp ) SOURCE_GROUP(SocketLib FILES @@ -339,8 +333,7 @@ ADD_LIBRARY(common ${common_sources} ${common_headers}) IF(UNIX) ADD_DEFINITIONS(-fPIC) - #TODO: Add "patches/RoF2.cpp" when it becomes active - SET_SOURCE_FILES_PROPERTIES("patches/SoD.cpp" "patches/SoF.cpp" "patches/RoF.cpp" "patches/Underfoot.cpp" PROPERTIES COMPILE_FLAGS -O0) + SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/underfoot.cpp" PROPERTIES COMPILE_FLAGS -O0) ENDIF(UNIX) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) diff --git a/common/EQNetwork.cpp b/common/EQNetwork.cpp deleted file mode 100644 index c4ec019ea..000000000 --- a/common/EQNetwork.cpp +++ /dev/null @@ -1,405 +0,0 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 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 -*/ -/* - * EQStream classes, by Quagmire -*/ - -#include "../common/debug.h" - -#include -#include -#ifdef WIN32 - #include -#else - #include - #include - #include - #include - #include - #include - #include - #include - #include "../common/unix.h" - #define SOCKET_ERROR -1 -#endif -#include "EQNetwork.h" -#include "EQStream.h" -#include "../common/packet_dump.h" -#include "../common/packet_dump_file.h" -#include "../common/packet_functions.h" -#include "../common/MiscFunctions.h" -#include "../common/crc32.h" -#include "../common/eq_packet_structs.h" - -#define EQN_DEBUG 0 -#define EQN_DEBUG_Error 0 -#define EQN_DEBUG_Packet 0 -#define EQN_DEBUG_Fragment 0 -#define EQN_DEBUG_ACK 0 -#define EQN_DEBUG_Unknown 0 -#define EQN_DEBUG_NewStream 0 -#define LOG_PACKETS 0 -#define LOG_RAW_PACKETS_OUT 0 -#define LOG_RAW_PACKETS_IN 0 -//#define PRIORITYTEST - -template // LO_BYTE -type LO_BYTE (type a) {return (a&=0xff);} -template // HI_BYTE -type HI_BYTE (type a) {return (a&=0xff00);} -template // LO_WORD -type LO_WORD (type a) {return (a&=0xffff);} -template // HI_WORD -type HI_WORD (type a) {return (a&=0xffff0000);} -template // HI_LOSWAPshort -type HI_LOSWAPshort (type a) {return (LO_BYTE(a)<<8) | (HI_BYTE(a)>>8);} -template // HI_LOSWAPlong -type HI_LOSWAPlong (type x) {return (LO_WORD(a)<<16) | (HIWORD(a)>>16);} - -EQStreamServer::EQStreamServer(uint16 iPort) { - RunLoop = false; - pPort = iPort; - pOpen = false; -#ifdef WIN32 - WORD version = MAKEWORD (1,1); - WSADATA wsadata; - WSAStartup (version, &wsadata); -#endif - sock = 0; -} - -EQStreamServer::~EQStreamServer() { - Close(); - RunLoop = false; - MLoopRunning.lock(); - MLoopRunning.unlock(); -#ifdef WIN32 - WSACleanup(); -#endif - connection_list.clear(); - while (!NewQueue.empty()) - NewQueue.pop(); // they're deleted with the list, clear this queue so it doesnt try to delete them again -} - -bool EQStreamServer::Open(uint16 iPort) { - LockMutex lock(&MOpen); - if (iPort && pPort != iPort) { - if (pOpen) - return false; - pPort = iPort; - } - if (!RunLoop) { - RunLoop = true; -#ifdef WIN32 - _beginthread(EQStreamServerLoop, 0, this); -#else - pthread_t thread; - pthread_create(&thread, NULL, &EQStreamServerLoop, this); -#endif - } - if (pOpen) { - return true; - } - else { - struct sockaddr_in address; -// int reuse_addr = 1; - int bufsize = 64 * 1024; // 64kbyte send/recieve buffers, up from default of 8k -#ifdef WIN32 - unsigned long nonblocking = 1; -#endif - - /* Setup internet address information. - This is used with the bind() call */ - memset((char *) &address, 0, sizeof(address)); - address.sin_family = AF_INET; - address.sin_port = htons(pPort); - address.sin_addr.s_addr = htonl(INADDR_ANY); - - /* Setting up UDP port for new clients */ - sock = socket(AF_INET, SOCK_DGRAM, 0); - if (sock < 0) { - return false; - } - -//#ifdef WIN32 -// setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &reuse_addr, sizeof(reuse_addr)); - setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char*) &bufsize, sizeof(bufsize)); - setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char*) &bufsize, sizeof(bufsize)); -//#else -// setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr)); -// setsockopt(sock, SOL_SOCKET, SO_RCVBUF, &bufsize, sizeof(bufsize)); -// setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &bufsize, sizeof(bufsize)); -//#endif - - if (bind(sock, (struct sockaddr *) &address, sizeof(address)) < 0) { -#ifdef WIN32 - closesocket(sock); -#else - close(sock); -#endif - return false; - } - -#ifdef WIN32 - ioctlsocket (sock, FIONBIO, &nonblocking); -#else - fcntl(sock, F_SETFL, O_NONBLOCK); -#endif - pOpen = true; - return true; - } -} - -void EQStreamServer::Close() { - SetOpen(false); - if (sock) { -#ifdef WIN32 - closesocket(sock); -#else - close(sock); -#endif - } - sock = 0; -} - -bool EQStreamServer::IsOpen() { - MOpen.lock(); - bool ret = pOpen; - MOpen.unlock(); - return ret; -} - -void EQStreamServer::SetOpen(bool iOpen) { - MOpen.lock(); - pOpen = iOpen; - MOpen.unlock(); -} - -void EQStreamServer::Process() { - _CP(EQStreamServer_Process); - if (!IsOpen()) { - if (sock) { -#ifdef WIN32 - closesocket(sock); -#else - close(sock); -#endif - sock = 0; - } - return; - } - - uchar buffer[1518]; - - int status; - struct sockaddr_in from; - unsigned int fromlen; - - from.sin_family = AF_INET; - fromlen = sizeof(from); - - while (1) { -#ifdef WIN32 - status = recvfrom(sock, (char *) buffer, sizeof(buffer), 0,(struct sockaddr*) &from, (int *) &fromlen); -#else - status = recvfrom(sock, buffer, sizeof(buffer), 0,(struct sockaddr*) &from, &fromlen); -#endif - if (status >= 1) { - cout << "Got data from recvfrom" << endl; - RecvData(buffer, status, from.sin_addr.s_addr, from.sin_port); - } - else { - break; - } - } - - std::map ::iterator connection; - for (connection = connection_list.begin(); connection != connection_list.end();) { - if (!connection->second) { - connection = connection_list.erase(connection); - continue; - } - EQStream* eqs_data = connection->second; - if (eqs_data->IsFree() && (!eqs_data->CheckNetActive())) { - safe_delete(eqs_data); - connection = connection_list.erase(connection); - } else if (!eqs_data->RunLoop) { - eqs_data->Process(sock); - ++connection; - } - } -} - -void EQStreamServer::RecvData(uchar* data, uint32 size, uint32 irIP, uint16 irPort) { -/* - CHANGE HISTORY - - Version Author Date Comment - 1 Unknown Unknown Initial Revision - 2 Joolz 05-Jan-2003 Optimised - 3 Quagmire 05-Feb-2003 Changed so 2 connection objects wouldnt be created for the same ip/port pair, often happened -*/ - - // Check for invalid data - if (!data || size <= 4) return; - //if (CRC32::Generate(data, size-4) != ntohl(*((uint32*) &data[size-4]))) { -#if EQN_DEBUG_Error >= 1 - //cout << "Incomming Packet failed checksum" << endl; -#endif - //return; - //} - - char temp[25]; - sprintf(temp,"%lu:%u",(unsigned long)irIP,irPort); - cout << "Data from " << temp << endl; - EQStream* tmp = NULL; - std::map ::iterator connection; - if ((connection=connection_list.find(temp))!=connection_list.end()) - tmp=connection->second; - if(tmp != NULL && tmp->GetrPort() == irPort) - { - tmp->RecvData(data, size); - return; - } - else if(tmp != NULL && tmp->GetrPort() != irPort) - { - printf("Conflicting IPs & Ports: IP %i and Port %i is conflicting with IP %i and Port %i\n",irIP,irPort,tmp->GetrIP(),tmp->GetrPort()); - return; - } - - if (data[1]==0x01) { - cout << "New EQStream Connection." << endl; - EQStream* tmp = new EQStream(irIP, irPort); - tmp->RecvData(data, size); - connection_list[temp]=tmp; - if (connection_list.find(temp)==connection_list.end()) { - cerr <<"Could not find new connection we just added!" << endl; - } - MNewQueue.lock(); - NewQueue.push(tmp); - MNewQueue.unlock(); - return; - } -#if EQN_DEBUG >= 4 - struct in_addr in; - in.s_addr = irIP; - cout << "WARNING: Stray packet? " << inet_ntoa(in) << ":" << irPort << endl; -#endif -} - -EQStream* EQStreamServer::NewQueuePop() { - EQStream* ret = 0; - MNewQueue.lock(); - if (!NewQueue.empty()) { - ret = NewQueue.front(); - NewQueue.pop(); - } - MNewQueue.unlock(); - return ret; -} - -#ifdef WIN32 - void EQStreamServerLoop(void* tmp) -#else - void* EQStreamServerLoop(void* tmp) -#endif -{ -#ifdef WIN32 - SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL); -#endif - EQStreamServer* eqns = (EQStreamServer*) tmp; - eqns->MLoopRunning.lock(); - while (eqns->RunLoop) { - { - _CP(EQStreamServerLoop); - eqns->Process(); - } - Sleep(1); - } - eqns->MLoopRunning.unlock(); -#ifdef WIN32 - _endthread(); -#else - return 0; -#endif -} - -#ifdef WIN32 - void EQStreamInLoop(void* tmp) -#else - void* EQStreamInLoop(void* tmp) -#endif -{ - EQStream* eqs = (EQStream*) tmp; -#ifdef _DEBUG - if (eqs->ConnectionType != Outgoing) { - ThrowError("EQStreamInLoop: eqs->ConnectionType != Outgoing"); - } -#endif - eqs->MLoopRunning.lock(); - Timer* tmp_timer = new Timer(100); - tmp_timer->Start(); - while (eqs->RunLoop) { - { - _CP(EQStreamInLoop); - if(tmp_timer->Check()) - eqs->DoRecvData(); - } - Sleep(1); - } - safe_delete(tmp_timer); - eqs->MLoopRunning.unlock(); -#ifdef WIN32 - _endthread(); -#else - return 0; -#endif -} - -#ifdef WIN32 - void EQStreamOutLoop(void* tmp) -#else - void* EQStreamOutLoop(void* tmp) -#endif -{ - EQStream* eqs = (EQStream*) tmp; -#ifdef _DEBUG - if (eqs->ConnectionType != Outgoing) { - ThrowError("EQStreamOutLoop: eqs->ConnectionType != Outgoing"); - } -#endif - eqs->MLoopRunning.lock(); - Timer* tmp_timer = new Timer(100); - tmp_timer->Start(); - while (eqs->RunLoop) { - { - _CP(EQStreamOutLoop); - if(tmp_timer->Check()) - eqs->Process(eqs->outsock); - } - Sleep(1); - } - safe_delete(tmp_timer); - eqs->MLoopRunning.unlock(); -#ifdef WIN32 - _endthread(); -#else - return 0; -#endif -} - diff --git a/common/EQNetwork.h b/common/EQNetwork.h deleted file mode 100644 index 1ecb23d6d..000000000 --- a/common/EQNetwork.h +++ /dev/null @@ -1,120 +0,0 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 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 -*/ -#ifndef EQNETWORK_H -#define EQNETWORK_H - -#include "../common/debug.h" - -//uncomment this to enable the packet profiler. Counts the number -//of each type of packet sent or received on a connection. -#ifdef ZONE -//#define PACKET_PROFILER 1 -#endif - -#include -#include -#include -#include - -#include "../common/types.h" -#include "../common/timer.h" -#include "../common/linked_list.h" -#include "../common/queue.h" -#include "../common/Mutex.h" -#include "../common/packet_functions.h" -#include "EQStream.h" -#ifdef PACKET_PROFILER -#include "../common/rdtsc.h" -#endif - -#define EQNC_TIMEOUT 60000 -#define NAS_TIMER 100 -#define KA_TIMER 400 /* keeps the lag bar constant */ -#define MAX_HEADER_SIZE 39 // Quag: 39 is the max header + opcode + crc32 + unknowns size - -class EQStreamServer; -class EQStream; -class EQStreamPacket; -class EQStreamFragmentGroupList; -class EQStreamFragmentGroup; -typedef EQStreamServer EQNServer; -typedef EQStream EQNConnection; -typedef EQStreamPacket EQNPacket; -typedef EQStreamFragmentGroupList EQNFragmentGroupList; -typedef EQStreamFragmentGroup EQNFragmentGroup; - -#define FLAG_COMPRESSED 0x1000 -#define FLAG_COMBINED 0x2000 -#define FLAG_ENCRYPTED 0x4000 -#define FLAG_IMPLICIT 0x8000 -#define FLAG_ALL 0xF000 -#define StripFlags(x) (x & ~FLAG_ALL) - -// Optimistic compression, used for guessing pre-alloc size on debug output -#define BEST_COMPR_RATIO 300 - -enum eappCompressed { appNormal, appInflated, appDeflated }; - -#ifdef WIN32 - void EQStreamServerLoop(void* tmp); - void EQStreamInLoop(void* tmp); - void EQStreamOutLoop(void* tmp); -#else - void* EQStreamServerLoop(void* tmp); - void* EQStreamInLoop(void* tmp); - void* EQStreamOutLoop(void* tmp); -#endif -class EQStreamServer { -public: - EQStreamServer(uint16 iPort = 0); - virtual ~EQStreamServer(); - - bool Open(uint16 iPort = 0); // opens the port - void Close(); // closes the port - void KillAll(); // kills all clients - inline uint16 GetPort() { return pPort; } - - EQStream* NewQueuePop(); -protected: -#ifdef WIN32 - friend void EQStreamServerLoop(void* tmp); -#else - friend void* EQStreamServerLoop(void* tmp); -#endif - void Process(); - bool IsOpen(); - void SetOpen(bool iOpen); - bool RunLoop; - Mutex MLoopRunning; -private: - void RecvData(uchar* data, uint32 size, uint32 irIP, uint16 irPort); -#ifdef WIN32 - SOCKET sock; -#else - int sock; -#endif - uint16 pPort; - bool pOpen; - Mutex MNewQueue; - Mutex MOpen; - - std::map connection_list; - std::queue NewQueue; -}; - -#endif diff --git a/common/MaxSkill.cpp b/common/MaxSkill.cpp deleted file mode 100644 index d24ffbc91..000000000 --- a/common/MaxSkill.cpp +++ /dev/null @@ -1,1900 +0,0 @@ -#include "../common/races.h" -#include "../common/classes.h" -#include "../zone/skills.h" - -uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level); -/* TODO: - Load MaxSkillTable function into ram as a really big matrix: - MaxSkillTable[skillid][race][eqclass][level] - - in preperation for that, dont put anything that wont work in - that table into MaxSkillTable (ie, AA checks, skill values that - depend on other skill values, etc), put it into MaxSkill instead -*/ -uint8 MaxSkill(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { - uint8 ret = MaxSkillTable(skillid, race, eqclass, level); - return ret; -} - -/* SPECIAL VALUES: - level: - 0 = "skill level at character create" - TODO: catch levels > 65 (ie, npcs) - race: - NPCs will always have their skills maxed, and often ignore class - restrictions, accomplished by the special values below. - EMU_RACE_NPC - EMU_RACE_PET - EMU_RACE_UNKNOWN - return value: - TODO: Find out the specal values for the client for "your class/race doesnt have this skill" and - "must put one point in at GM", etc - -*/ -uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { - uint16 r_value = 0; - - switch (skillid) { - /////////////// - // Melee Weapon/ Hand to Hand - /////////////// - case _1H_BLUNT: - case _2H_BLUNT: - case PIERCING: - case HAND_TO_HAND: - case _1H_SLASHING: - case _2H_SLASHING:{ - switch (eqclass) { - // Pure melee classes - case WARRIOR: case WARRIORGM: { - r_value = 5 + (level*5); - if ( level < 51 && r_value > 200) - r_value = 200; - if ( level > 51 && r_value > 250 ) - r_value = 250; - switch (skillid) { - case PIERCING: { - if ( r_value > 240 ) - r_value = 240; - break; - } - case HAND_TO_HAND: { - if ( r_value > 100 ) - r_value = 100; - break; - } - default: - break; - } - break; - } - case MONK: case MONKGM: { - r_value = 5 + (level*5); - if ( level < 51 && r_value > 240) - if ( r_value > 240 ) - r_value = 240; - if ( r_value > 252 ) - r_value = 252; - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 225 && level < 51 ) - r_value = 225; - break; - } - case PIERCING: - case _1H_SLASHING: - case _2H_SLASHING:{ - r_value = 0; - break; - } - default: - break; - } - break; - } - case ROGUE: case ROGUEGM: { - r_value = 5 + (level*5); - if ( level > 50 ) { - if ( r_value > 250 ) - r_value = 250; - } - else if ( level < 51 ) { - if ( r_value > 200 && skillid != PIERCING ) - r_value = 200; - switch (skillid) { - case PIERCING: { - if (r_value > 210) - r_value = 210; - break; - } - default: - break; - } - } - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 100 ) - r_value = 100; - break; - } - default: - break; - - } - break; - } - - ////////////////////////////////////////////////////////////// - // Melee Weapon/ Hand to Hand - // Priest classes - ////////////////////////////////////////////////////////////// - case CLERIC: case CLERICGM:{ - r_value = 4 + (level*4); - if ( r_value > 175 ){ - r_value = 175; - } - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 75 ) - r_value = 75; - break; - } - case PIERCING: - case _1H_SLASHING: - case _2H_SLASHING: { - r_value = 0; - break; - } - default: - break; - } - break; - } - case DRUID: case DRUIDGM:{ - r_value = 4 + (level*4); - if ( r_value > 175 ){ - r_value = 175; - } - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 75 ) - r_value = 75; - } - case PIERCING: - case _2H_SLASHING:{ - r_value = 0; - break; - } - default: - break; - } - break; - } - case SHAMAN: case SHAMANGM:{ - r_value = 4 + (level*4); - if ( r_value > 200 ){ - r_value = 200; - } - switch (skillid) { - case HAND_TO_HAND: { - if ( r_value > 75 ) - r_value = 75; - } - case _1H_SLASHING: - case _2H_SLASHING:{ - r_value = 0; - break; - } - default: - break; - } - break; - } - - /////////////////////////////////////////////////////////// - // Melee Weapon/ Hand to Hand - // Hybrids - ////////////////////////////////////////////////////////// - case RANGER: case RANGERGM:{ - r_value = 5 + (level*5); - if ( level > 50 ) { - if ( r_value > 250 ) - r_value = 250; - - switch (skillid) { - case PIERCING: { - if ( r_value > 240 ) - r_value = 240; - break; - } - default: - break; - } - } - else if ( level < 51 ) { - if ( r_value > 200 ) - r_value = 200; - } - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 100 ) - r_value = 100; - break; - } - default: - break; - } - break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - r_value = 5 + (level*5); - if ( level > 50 ){ - if ( r_value > 225 ) - r_value = 225; - } - if ( level < 51 ){ - if ( r_value > 200 ) - r_value = 200; - } - - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 100 ) - r_value = 100; - break; - } - default: - break; - } - break; - } - case BARD: case BARDGM: { - r_value = 5 + (level*5); - if ( level > 51 && r_value > 225 ) - r_value = 225; - if ( level < 51 && r_value > 200 ) - r_value = 200; - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 100 ) - r_value = 100; - break; - } - case _2H_BLUNT: - case _2H_SLASHING:{ - r_value = 0; - - } - default: - break; - } - break; - } - - case BEASTLORD: case BEASTLORDGM:{ - r_value = 4 + (level*4); - if ( level > 51 ){ - if ( r_value > 225 && skillid != HAND_TO_HAND ) - r_value = 225; - } - if ( r_value > 250 ) - r_value = 250; - if ( level < 51 && r_value > 200 ) - r_value = 200; - - switch (skillid) { - case HAND_TO_HAND:{ - r_value = 5 + (level*5); - if ( level < 51 ) - r_value = 200; - - if ( r_value > 250 ) - r_value = 250; - break; - } - case _1H_SLASHING: - case _2H_SLASHING:{ - r_value = 0; - break; - } - default: - break; - } - break; - } - - // Melee Weapon/ Hand to Hand - // Pure casters - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - r_value = 3 + (level*3); - if ( r_value > 110 ) - r_value = 110; - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 75 ) - r_value = 75; - break; - } - case _1H_SLASHING: - case _2H_SLASHING:{ - r_value = 0; - break; - } - default: - break; - } - } - default: { - r_value = 0; - break; - } - }// end switch(eqclass) - break; - } // end case weapon skills - - -///////////////////////////////////////////////////////////// -// Combat non weapon -///////////////////////////////////////////////////////////// - -// Attack - case OFFENSE: { - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM: - case ROGUE: case ROGUEGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - case MONK: case MONKGM:{ - // 230 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 230) - r_value = 230; - } - if (r_value > 252) - r_value = 252; - break; - } - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM:{ - // 200 200 4*level+4 - r_value = ((level*4) + 4); - if (r_value > 200) - r_value = 200; - break; - } - // Hybrid - case BEASTLORD: case BEASTLORDGM:{ - // 200 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 252) - r_value = 252; - break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - case BARD: case BARDGM:{ - // 200 225 5*level+5 - - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 225) - r_value = 225; - break; - } - case RANGER: case RANGERGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - // 140 140 level*4 - r_value = (level*4); - if (r_value > 140) - r_value = 140; - break; - } - default: { - r_value = 0; - break; - } - } // end switch (eqclass) - break; - } // end case OFFENSE - case THROWING: { - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM:{ - // 220 250 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 220) - r_value = 220; - } - if (r_value > 250) - r_value = 250; - break; - } - case WARRIOR: case WARRIORGM: - case MONK: case MONKGM:{ - // 113 200 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 113) - r_value = 113; - } - if (r_value > 200) - r_value = 200; - break; - } - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case BARD: case BARDGM: - case RANGER: case RANGERGM:{ - // 113 - r_value = ((level*5) + 5); - if ( r_value > 113 ) - r_value = 113; - break; - } - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - // 75 - r_value = ((level*3) + 3); - if ( r_value > 75 ) - r_value = 75; - break; - } - // No skill classes - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - default: { - r_value = 0; - break; - } - } // end switch (eqclass) - break; - } // end case THROWING: - case ARCHERY: { - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM: - case WARRIOR: case WARRIORGM:{ - // 200 240 - r_value = ((level*5) + 5); - if ( level < 51 && r_value > 200) - r_value = 200; - if (r_value > 240) - r_value = 240; - break; - } - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 75 75 - r_value = ((level*5) + 5); - if ( r_value > 75 ) - r_value = 75; - break; - } - case RANGER: case RANGERGM:{ - // 240 240 - r_value = ((level*5) + 5); - if ( r_value > 240 ) - r_value = 240; - break; - } - // Pure - // No skill classes - // Melee - case MONK: case MONKGM: - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case BARD: case BARDGM: - default: { - r_value = 0; - break; - } - } // end switch (eqclass) - break; - } // end case ARCHERY: - case DOUBLE_ATTACK: { - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM:{ - // 16 200 240 - r_value = ((level*5) + 5); - if ( level < 16 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 240) - r_value = 240; - break; - } - case WARRIOR: case WARRIORGM:{ - // 15 205 245 - r_value = ((level*5) + 5); - if ( level < 15 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 245) - r_value = 245; - break; - } - case MONK: case MONKGM:{ - // 15 210 250 - r_value = ((level*5) + 5); - if ( level < 15 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 250) - r_value = 250; - break; - } - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 20 200 235 - r_value = ((level*5) + 5); - if ( level < 20 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 235) - r_value = 235; - break; - } - case RANGER: case RANGERGM:{ - // 20 200 245 - r_value = ((level*5) + 5); - if ( level < 20 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 245) - r_value = 245; - break; - } - // Pure - // No skill classes - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case BARD: case BARDGM: - default: { - r_value = 0; - - break; - } - } // end switch (eqclass) - break; - } // end case DOUBLE_ATTACK: - case DUEL_WIELD: { - switch (eqclass) { - // Melee - case MONK: case MONKGM:{ - // 1 252 252 - r_value = level*7; // This can't be right can it? - break; - } - case WARRIOR: case WARRIORGM: - case ROGUE: case ROGUEGM: { - // 15 210 245 - r_value = ((level*5) + 5); - if ( level < 15 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 245) - r_value = 245; - break; - } - // Hybrid - case BEASTLORD: case BEASTLORDGM: - // 17 210 245 - case RANGER: case RANGERGM:{ - // 17 210 245 - r_value = ((level*5) + 5); - if ( level < 17 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 245) - r_value = 245; - break; - } - case BARD: case BARDGM:{ - // 17 210 210 - r_value = ((level*5) + 5); - if ( level < 17 ) - r_value = 0; - if (r_value > 210) - r_value = 210; - break; - } - // No skill classes - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - default: { - r_value = 0; - break; - } - }// end Class switch - break; - } // end case DUEL_WIELD: - case KICK: { - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 1 149 210 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 149) - r_value = 149; - } - if (r_value > 210) - r_value = 210; - break; - } - case MONK: case MONKGM:{ - // 1 200 250 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 250) - r_value = 250; - break; - } - // Hybrid - case RANGER: case RANGERGM:{ - // 5 149 205 - r_value = ((level*5) + 5); - if ( level < 5 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 149) - r_value = 149; - } - if (r_value > 205) - r_value = 205; - break; - } - case BEASTLORD: case BEASTLORDGM:{ - // 5 180 230 - r_value = ((level*5) + 5); - if ( level < 5 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 180) - r_value = 180; - } - if (r_value > 230) - r_value = 230; - break; - } - // Pure - // No skill classes - case ROGUE: case ROGUEGM: - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - case BARD: case BARDGM: - default: { - r_value = 0; - break; - } - } // end switch(eqclass) - break; - } // end case KICK: - /////////// - // FIXME Where is slam? - // Quagmire: Slam = bash w/ race check - case BASH:{ - r_value = ((level*5)+5); - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 6 220 240 - if (level < 6) - r_value = 0; - if (level < 51 && r_value > 220) - r_value = 220; - if (r_value > 240) - r_value = 240; - break; - } - // Priest - case CLERIC: case CLERICGM:{ - // 25 180 200 - if (level < 25) - r_value = 0; - if (level < 51 && r_value > 180) - r_value = 180; - if (r_value > 200) - r_value = 200; - break; - } - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 6 175 200 - if (level < 6) - r_value = 0; - if (level < 51 && r_value > 175) - r_value = 175; - if (r_value > 200) - r_value = 200; - break; - } - // Pure - // No skill classes - // Melee - case MONK: case MONKGM: - case ROGUE: case ROGUEGM: - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case RANGER: case RANGERGM: - case BARD: case BARDGM:{ - switch (race) { - case BARBARIAN: - case TROLL: - case OGRE:{ - r_value = 50; - break; - } - default: { - break; - } - } // end switch (race) - r_value = 0; - break; - } - } - break; - } // end case BASH: - ///////////////////////////////////// - ///////////////////////////////////// - // Defensive skills - case DEFENSE:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - case ROGUE: case ROGUEGM:{ - // 200 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 252) - r_value = 252; - break; - } - case MONK: case MONKGM:{ - // 230 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 230) - r_value = 230; - } - if (r_value > 252) - r_value = 252; - break; - } - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM:{ - // 200 200 4*level+4 - r_value = ((level*4) + 4); - if (r_value > 200) - r_value = 200; - break; - } - // Hybrid - case BEASTLORD: case BEASTLORDGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - case BARD: case BARDGM:{ - // 200 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 252) - r_value = 252; - break; - } - case RANGER: case RANGERGM:{ - // 200 200 5*level+5 - r_value = ((level*5) + 5); - if (r_value > 200) - r_value = 200; - break; - } - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - // 145 145 level*4 - r_value = (level*4); - if (r_value > 140) - r_value = 140; - break; - } - default: { - break; - } - } // end switch(eqclass) - break; - } // end case DEFENSE: - case PARRY:{ - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM:{ - // 12 200 230 - r_value = ((level*5) + 5); - if ( level < 12 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 230) - r_value = 230; - break; - } - case WARRIOR: case WARRIORGM:{ - // 10 200 230 - r_value = ((level*5) + 5); - if ( level < 10 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 230) - r_value = 230; - break; - } - // Hybrid - case BARD: case BARDGM:{ - // 53 0 75 - r_value = ((level*5) + 5); - if ( level < 53 ) - r_value = 0; - if (r_value > 75) - r_value = 75; - break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 17 175 205 - r_value = ((level*5) + 5); - if ( level < 17 ) - r_value = 0; - if (r_value > 175 && level < 51 ) - r_value = 175; - if (r_value > 205) - r_value = 205; - break; - } - case RANGER: case RANGERGM:{ - // 18 185 220 - r_value = ((level*5) + 5); - if ( level < 18 ) - r_value = 0; - if (r_value > 185 && level < 51 ) - r_value = 185; - if (r_value > 220) - r_value = 220; - break; - } - // Pure - // No skill classes - // Melee - case MONK: case MONKGM: - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: - default: { - r_value = 0; - break; - } - } // end switch (eqclass) - break; - } // end case PARRY: - case RIPOSTE:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 25 200 225 - r_value = ((level*5) + 5); - if ( level < 25 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case ROGUE: case ROGUEGM:{ - // 30 200 225 - r_value = ((level*5) + 5); - if ( level < 30 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case MONK: case MONKGM:{ - // 35 200 225 - r_value = ((level*5) + 5); - if ( level < 35 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - // Hybrid - case BEASTLORD: case BEASTLORDGM:{ - // 40 150 185 - r_value = ((level*5) + 5); - if ( level < 40 ) - r_value = 0; - if (r_value > 150 && level < 51 ) - r_value = 150; - if (r_value > 185) - r_value = 185; - break; - } - case BARD: case BARDGM:{ - // 58 75 75 - r_value = ((level*5) + 5); - if ( level < 58 ) - r_value = 0; - if (r_value > 75) - r_value = 75; - break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 30 175 200 - r_value = ((level*5) + 5); - if ( level < 30 ) - r_value = 0; - if (r_value > 175 && level < 51 ) - r_value = 175; - if (r_value > 200) - r_value = 200; - break; - } - case RANGER: case RANGERGM:{ - // 35 150 150 - r_value = ((level*5) + 5); - if ( level < 35 ) - r_value = 0; - if (r_value > 150) - r_value = 150; - break; - } - // Pure - // No skill classes - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - default: { - r_value = 0; - break; - } - } // end switch (eqclass) - break; - } // end case RIPOSTE: - case DODGE:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 6 140 175 - r_value = ((level*5) + 5); - if ( level < 6 ) - r_value = 0; - if (r_value > 140 && level < 51 ) - r_value = 140; - if (r_value > 175) - r_value = 175; - break; - } - case ROGUE: case ROGUEGM:{ - // 4 150 210 - r_value = ((level*5) + 5); - if ( level < 4 ) - r_value = 0; - if (r_value > 150 && level < 51 ) - r_value = 150; - if (r_value > 210) - r_value = 210; - break; - } - case MONK: case MONKGM:{ - // 1 200 230 - r_value = ((level*5) + 5); - if (r_value > 200) - r_value = 200; - if (r_value > 230) - r_value = 230; - break; - } - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM:{ - // 15 75 75 4*level+4 - r_value = ((level*4) + 4); - if ( level < 15 ) - r_value = 0; - if (r_value > 75) - r_value = 75; - break; - } - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - case BARD: case BARDGM:{ - // 10 125 155 5*level+5 - r_value = ((level*5) + 5); - if ( level < 10 ) - r_value = 0; - if (r_value > 125 && level < 51 ) - r_value = 125; - if (r_value > 155) - r_value = 155; - break; - } - - case RANGER: case RANGERGM:{ - // 8 137 170 5*level+5 - r_value = ((level*5) + 5); - if ( level < 8 ) - r_value = 0; - if (r_value > 137 && level < 51 ) - r_value = 137; - if (r_value > 170) - r_value = 170; - break; - } - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - // 22 75 75 3*level+3 - r_value = ((level*3) + 3); - if ( level < 22 ) - r_value = 0; - if (r_value > 75) - r_value = 75; - break; - } - // No skill classes - // Melee - // Priest - // Pure - // Hybrid - default: { - r_value = 0; - break; - } - } // end switch (eqclass) - break; - } // end case DODGE: - // Other - case TAUNT:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 1 200 200 - r_value = ((level*5) + 5); - if (r_value > 200) - r_value = 200; - break; - } - // Priest - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 1 180 180 - r_value = ((level*5) + 5); - if (r_value > 180) - r_value = 180; - break; - } - case RANGER: case RANGERGM:{ - // 1 150 150 - r_value = ((level*5) + 5); - if (r_value > 150) - r_value = 150; - break; - } - // Pure - // No skill classes - // Melee - case ROGUE: case ROGUEGM: - case MONK: case MONKGM: - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case BARD: case BARDGM: - default: { - r_value = 0; - break; - } - } // end swtich (eqclass) - break; - } // end case TAUNT: - - case DISARM:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 35 200 200 - r_value = ((level*5) + 5); - if (level < 35) - r_value = 0; - if (r_value > 200) - r_value = 200; - break; - } - case ROGUE: case ROGUEGM: - case MONK: case MONKGM:{ - // 27 200 200 - r_value = ((level*5) + 5); - if (level < 27) - r_value = 0; - if (r_value > 200) - r_value = 200; - break; - } - // Priest - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 40 70 70 - r_value = ((level*5) + 5); - if (level < 40) - r_value = 0; - if (r_value > 70) - r_value = 70; - break; - } - case RANGER: case RANGERGM:{ - // 35 55 55 - r_value = ((level*5) + 5); - if (level < 35) - r_value = 0; - if (r_value > 55) - r_value = 55; - break; - } - // Pure - // No skill classes - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BARD: case BARDGM: - case BEASTLORD: case BEASTLORDGM: - default: { - r_value = 0; - break; - } - } // end switch (eqclass) - break; - } // end case DISARM: - /////////////////////////////////////////// - /////////////////////////////////////////// - // Spell Skills - case MEDITATE: - case ABJURE: - - case ALTERATION: - case CHANNELING: - case CONJURATION: - case DIVINATION: - - case EVOCATION:{ - r_value = ((level*5) + 5); - switch(eqclass){ - // Hybrid - case RANGER: case RANGERGM:{ - // 9 235 235 - // Channel 9 200 215 - // Med 12 185 235 - if (level < 9) - r_value = 0; - if (level < 12 && skillid == MEDITATE) - r_value = 0; - if (r_value > 0 && skillid == CHANNELING) { - if ( level < 51 && r_value > 200) - r_value = 200; - if (r_value > 215) - r_value = 215; - } - if (r_value > 0 && skillid == MEDITATE) { - if ( level < 51 && r_value > 185) - r_value = 185; - if (r_value > 235) - r_value = 235; - } - break; - } - case BEASTLORD: case BEASTLORDGM: - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 9 235 235 - // Channel 9 200 220 - // Med 12 185 235 - if (level < 9) - r_value = 0; - if (level < 12 && skillid == MEDITATE) - r_value = 0; - if (r_value > 0 && skillid == CHANNELING) { - if ( level < 51 && r_value > 185) - r_value = 185; - if (r_value > 220) - r_value = 220; - } - if (r_value > 0 && skillid == MEDITATE) { - if ( level < 51 && r_value > 185) - r_value = 185; - if (r_value > 235) - r_value = 235; - } - break; - } - // Priest - case CLERIC: case CLERICGM: - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM:{ - // 1 235 235 - // Channel 4 200 220 - // Med 8 235 252 - if (level < 4 && skillid == CHANNELING) - r_value = 0; - if (level < 8 && skillid == MEDITATE) - r_value = 0; - if (r_value > 0 && skillid == CHANNELING) { - if ( level < 51 && r_value > 200) - r_value = 200; - if (r_value > 220) - r_value = 220; - } - if (r_value > 0 && skillid == MEDITATE) { - if ( level < 51 && r_value > 235) - r_value = 235; - if (r_value > 252) - r_value = 252; - } - break; - } - // Int caster - case ENCHANTER: case ENCHANTERGM: - case MAGICIAN: case MAGICIANGM: - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM:{ - // 1 235 235 - // Channel 1 200 220 - // Med 4 235 252 - if (level < 4 && skillid == MEDITATE) - r_value = 0; - if (r_value > 0 && skillid == CHANNELING) { - if ( level < 51 && r_value > 200) - r_value = 200; - if (r_value > 220) - r_value = 220; - } - if (r_value > 0 && skillid == MEDITATE) { - if ( level < 51 && r_value > 235) - r_value = 235; - if (r_value > 252) - r_value = 252; - } - break; - } - case BARD: case BARDGM:{ - r_value = 0; - if (level > 9 && skillid == MEDITATE) - r_value = 1; - break; - } - default: { - // Unknown class - r_value = 0; - break; - } - }// Class Switch - break; - } // end spell skills - - case SPECIALIZE_ABJURE: - case SPECIALIZE_ALTERATION: - case SPECIALIZE_CONJURATION: - case SPECIALIZE_DIVINATION: - case SPECIALIZE_EVOCATION: - case RESEARCH:{ - r_value = ((level*5) + 5); - switch(eqclass){ - // Int caster - case ENCHANTER: case ENCHANTERGM: - case MAGICIAN: case MAGICIANGM: - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM:{ - // Res 16 200 200 - if (level < 16 && skillid == RESEARCH) - r_value = 0; - if (r_value > 0 && skillid == RESEARCH) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 235) - r_value = 235; - // FIXME Only let one SPEC go above what ever limit theres supposed to be - break; - } - default:{ - r_value = 0; - break; - } - }// Class Switch - break; - } // end specilize & research skills - - case BRASS_INSTRUMENTS: - case SINGING: - case STRINGED_INSTRUMENTS: - case WIND_INSTRUMENTS: - case PERCUSSION_INSTRUMENTS:{ - switch(eqclass){ - case BARD: case BARDGM:{ - r_value = ((level*5) + 5); - if (level < 5 && skillid == PERCUSSION_INSTRUMENTS){ - r_value = 0; - } - if (level < 8 && skillid == STRINGED_INSTRUMENTS){ - r_value = 0; - } - if (level < 11 && skillid == BRASS_INSTRUMENTS){ - r_value = 0; - } - if (level < 14 && skillid == WIND_INSTRUMENTS){ - r_value = 0; - } - if (r_value > 235) - r_value = 235; - break; - } - default: { - r_value = 0; - } - break; - }// Class Switch - break; - } // bard song skills - /////////////////////////////////////////// - /////////////////////////////////////////// - // Class skills - // Rogue - case APPLY_POISON: - case MAKE_POISON: - case PICK_POCKETS: - case BACKSTAB:{ - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM: { - r_value = ((level*5) + 5); - switch (skillid){ - case APPLY_POISON:{ - // 18 200 200 - if (level < 18) - r_value = 0; - if (r_value > 200) - r_value = 200; - break; - } - case MAKE_POISON:{ - // 20 200 250 - if (level < 20) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 250) - r_value = 250; - break; - } - case PICK_POCKETS:{ - // 7 200 210 - if (level < 7) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 210) - r_value = 210; - break; - } - case BACKSTAB:{ - // 10 200 225 - if (level < 10) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - default: { - r_value = 0; - break; - } - } // end switch (skillid) - break; - } // end case ROGUE: case ROGUEGM: - default: { - r_value = 0; - break; - } - }// Class Switch - break; - } // end rogue skills - // Monk - case FEIGN_DEATH: - case MEND: - case DRAGON_PUNCH: - case EAGLE_STRIKE: - case FLYING_KICK: - case ROUND_KICK: - case TIGER_CLAW: - case BLOCKSKILL:{ - switch(eqclass){ - case MONK: case MONKGM:{ - r_value = ((level*5) + 5); - switch (skillid){ - case MEND:{ - // 1 200 200 - if (r_value > 200) - r_value = 200; - break; - } - case ROUND_KICK:{ - // 5 200 225 - if (level < 5) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case TIGER_CLAW:{ - // 10 200 225 - if (level < 10) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case BLOCKSKILL:{ - // 12 200 230 - if (level < 12) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 230) - r_value = 230; - break; - } - case FEIGN_DEATH:{ - // 17 200 200 - if (level < 17) - r_value = 0; - if (r_value > 200) - r_value = 200; - break; - } - case EAGLE_STRIKE:{ - // 20 200 225 - if (level < 20) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case DRAGON_PUNCH:{ - // 25 200 225 - if (level < 25) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case FLYING_KICK:{ - // 30 200 225 - if (level < 30) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - default: { - r_value = 0; - break; - } - } // end switch (skillid) - break; - } // end case MONK: case MONKGM: - default: { - r_value = 0; - break; - } - }// Class Switch - break; - } // end monk skills - // Shaman - case ALCHEMY:{ - switch(eqclass){ - case SHAMAN: case SHAMANGM:{ - // 25 130 180 - r_value = ((level*5) + 5); - if (level < 25) - r_value = 0; - if (level < 51 && r_value > 130) - r_value = 130; - if (r_value > 180) - r_value = 180; - break; - } - default: { - r_value = 0; - break; - } - }// Class Switch - break; - } // end case ALCHEMY: - /////////////////////////////////////////// - ////////////////////////////////////////// - // Shared skill - // Shared Rogue - case HIDE: - case SNEAK:{ - switch(eqclass){ - // True class - case ROGUE: case ROGUEGM:{ - break; - } - // Hybrids - case MONK: case MONKGM: - case RANGER: case RANGERGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - case BARD: case BARDGM:{ - break; - } - default: { - r_value = 0; - break; - } - }// Class Switch - } // end sneak/hide - case SENSE_TRAPS: - case PICK_LOCK: - case DISARM_TRAPS:{ - switch(eqclass){ - // True class - case ROGUE: case ROGUEGM:{ - break; - } - // Hybrids - case BARD: case BARDGM:{ - break; - } - default: { - r_value = 0; - break; - } - }// Class Switch - break; - } // end case SENSE_TRAPS/PICK_LOCK/DISARM_TRAPS - case SAFE_FALL: - case INTIMIDATION:{ - switch(eqclass){ - // Melee - case MONK: case MONKGM: - case ROGUE: case ROGUEGM:{ - break; - } - default: { - r_value = 0; - break; - } - }// Class Switch - break; - } // end SAFE_FALL/INTIMIDATION - // Druid/Ranger/Bard - case FORAGE:{ - switch(eqclass) { - case DRUID: case DRUIDGM: - case RANGER: case RANGERGM:{ - if (r_value > 200) - r_value = 200; - break; - } - case BARD: case BARDGM: { - r_value = 55; - break; - } - default: { - r_value = 00; - break; - } - } // end switch (eqclass) - break; - } // end case FORAGE: - case TRACKING:{ - switch(eqclass){ - case RANGER: case RANGERGM: - case BARD: case BARDGM: - case DRUID: case DRUIDGM: { - } - default: { - r_value = 0; - break; - } - }// Class Switch - } // end case TRACKING - /////////////////////////////////////////// - /////////////////////////////////////////// - // Tradeskills - case BAKING: - case TAILORING: - case BLACKSMITHING: - case FLETCHING: - case BREWING: - case JEWELRY_MAKING: - case POTTERY: - case FISHING:{ - // Check for Any Trade above 200, check for X (aa skill) Trades above 200 - r_value = 200; - break; - } - - /////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - // Gnome - /////////////////////////////////////////////////////////////////// - case TINKERING:{ - if ( race == GNOME && level > 24 ) { - r_value = ((level*5)+5); - break; - } - r_value = 0; - break; - } // end case TINKERING: - - ///////////////////////////////////////// - // Common - ///////////////////////////////////////// - case BIND_WOUND:{ - r_value = 5 + (level*5); - if (level > 50){ - // Check for aa and class - } - if (r_value > 200) - r_value = 200; - switch (eqclass) { - case ENCHANTER: case ENCHANTERGM: - case MAGICIAN: case MAGICIANGM: - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM:{ - if ( r_value > 100 ) - r_value = 100; - } - default: { - break; - } - } // end switch (eqclass) - break; - } // end case BIND_WOUND: - case SENSE_HEADING: - case SWIMMING: - case ALCOHOL_TOLERANCE: - case BEGGING:{ - r_value = 5 + (level*5); - if (r_value > 200) - r_value = 200; - break; - } - //case BERSERKING: - default: { - // Unknown skill we should like print something to a log/debug here - r_value = 0; - break; - } - } // end switch (skillid) -// NO skill may go over 252 - if (r_value > 252) - r_value = 252; - return r_value; -} diff --git a/common/SocketLib/HTTPSocket.cpp b/common/SocketLib/HTTPSocket.cpp index 9d0eaa5be..ecde78403 100644 --- a/common/SocketLib/HTTPSocket.cpp +++ b/common/SocketLib/HTTPSocket.cpp @@ -46,7 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include "Parse.h" #include "HTTPSocket.h" -#include "../TCPConnection.h" +#include "../tcp_connection.h" #include #include diff --git a/common/SocketLib/HTTPSocket.h b/common/SocketLib/HTTPSocket.h index 96f4cf389..409c90bce 100644 --- a/common/SocketLib/HTTPSocket.h +++ b/common/SocketLib/HTTPSocket.h @@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include "../TCPConnection.h" +#include "../tcp_connection.h" #ifdef SOCKETS_NAMESPACE diff --git a/common/database.cpp b/common/database.cpp index 2d5bdbdcc..e82f350b1 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -43,7 +43,7 @@ #include "database.h" #include "eq_packet_structs.h" #include "guilds.h" -#include "StringUtil.h" +#include "string_util.h" #include "extprofile.h" extern Client client; diff --git a/common/database.h b/common/database.h index 9be05f0cd..61ed19ef4 100644 --- a/common/database.h +++ b/common/database.h @@ -26,11 +26,11 @@ #include "dbcore.h" #include "linked_list.h" #include "eq_packet_structs.h" -/*#include "EQStream.h" +/*#include "eq_stream.h" #include "guilds.h" -#include "MiscFunctions.h" +#include "misc_functions.h" #include "Mutex.h" -#include "Item.h" +#include "item.h" #include "extprofile.h"*/ #include #include diff --git a/common/dbasync.cpp b/common/dbasync.cpp index 4153bc6fa..00714c2a0 100644 --- a/common/dbasync.cpp +++ b/common/dbasync.cpp @@ -12,8 +12,8 @@ #include #include "dbcore.h" #include -//#include "../common/MiscFunctions.h" -#include "StringUtil.h" +//#include "../common/misc_functions.h" +#include "string_util.h" #define ASYNC_LOOP_GRANULARITY 4 //# of ms between checking our work bool DBAsyncCB_LoadVariables(DBAsyncWork* iWork) { diff --git a/common/dbcore.cpp b/common/dbcore.cpp index 3d25236c7..21168efa0 100644 --- a/common/dbcore.cpp +++ b/common/dbcore.cpp @@ -10,7 +10,7 @@ #include #include "dbcore.h" #include -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include #ifdef _WINDOWS diff --git a/common/dbcore.h b/common/dbcore.h index e90c5e249..eb7a5832e 100644 --- a/common/dbcore.h +++ b/common/dbcore.h @@ -14,7 +14,7 @@ #include "../common/queue.h" #include "../common/timer.h" #include "../common/condition.h" -#include "../common/MySQLRequestResult.h" +#include "../common/mysql_request_result.h" class DBcore { public: diff --git a/common/debug.cpp b/common/debug.cpp index fa114a338..228d57631 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -19,8 +19,8 @@ #endif #include "debug.h" -#include "StringUtil.h" -#include "MiscFunctions.h" +#include "string_util.h" +#include "misc_functions.h" #include "platform.h" #ifndef va_copy diff --git a/common/emu_tcp_connection.h b/common/emu_tcp_connection.h index ff7dd8995..c7d88965d 100644 --- a/common/emu_tcp_connection.h +++ b/common/emu_tcp_connection.h @@ -1,7 +1,7 @@ #ifndef EmuTCPCONNECTION_H_ #define EmuTCPCONNECTION_H_ -#include "TCPConnection.h" +#include "tcp_connection.h" #include "timer.h" //moved out of TCPConnection:: to be more exportable diff --git a/common/emu_tcp_server.h b/common/emu_tcp_server.h index c84524662..8941812ad 100644 --- a/common/emu_tcp_server.h +++ b/common/emu_tcp_server.h @@ -1,7 +1,7 @@ #ifndef EmuTCPSERVER_H_ #define EmuTCPSERVER_H_ -#include "TCPServer.h" +#include "tcp_server.h" class EmuTCPConnection; struct EmuTCPNetPacket_Struct; diff --git a/common/eq_dictionary.cpp b/common/eq_dictionary.cpp index 4c772689d..595d0cc5f 100644 --- a/common/eq_dictionary.cpp +++ b/common/eq_dictionary.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "eq_dictionary.h" -#include "StringUtil.h" +#include "string_util.h" // // class EmuConstants diff --git a/common/eq_dictionary.h b/common/eq_dictionary.h index eb35f5127..14f9d53d3 100644 --- a/common/eq_dictionary.h +++ b/common/eq_dictionary.h @@ -26,13 +26,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "eq_constants.h" #include "clientversions.h" #include -#include "../common/patches/Client62_constants.h" -#include "../common/patches/Titanium_constants.h" -#include "../common/patches/SoF_constants.h" -#include "../common/patches/SoD_constants.h" -#include "../common/patches/Underfoot_constants.h" -#include "../common/patches/RoF_constants.h" -//#include "../common/patches/RoF2_constants.h" +#include "../common/patches/client62_constants.h" +#include "../common/patches/titanium_constants.h" +#include "../common/patches/sof_constants.h" +#include "../common/patches/sod_constants.h" +#include "../common/patches/underfoot_constants.h" +#include "../common/patches/rof_constants.h" +//#include "../common/patches/rof2_constants.h" // *** DO NOT CHANGE without a full understanding of the consequences..the server is set up to use these settings explicitly!! *** // *** You will cause compilation failures and corrupt your database if partial or incorrect attempts to change them are made!! *** diff --git a/common/eq_packet.cpp b/common/eq_packet.cpp index b2d335b41..3ea622040 100644 --- a/common/eq_packet.cpp +++ b/common/eq_packet.cpp @@ -19,7 +19,7 @@ #include #include #include -#include "EQPacket.h" +#include "eq_packet.h" #include "misc.h" #include "op_codes.h" #include "crc16.h" diff --git a/common/EQPacket.h b/common/eq_packet.h similarity index 99% rename from common/EQPacket.h rename to common/eq_packet.h index 83a37da32..9e0bcec3e 100644 --- a/common/EQPacket.h +++ b/common/eq_packet.h @@ -19,7 +19,7 @@ #define _EQPACKET_H #include "base_packet.h" -#include "EQStreamType.h" +#include "eq_stream_type.h" #include "op_codes.h" #include "platform.h" diff --git a/common/eq_stream.cpp b/common/eq_stream.cpp index 473a986a7..cb4aeb853 100644 --- a/common/eq_stream.cpp +++ b/common/eq_stream.cpp @@ -17,8 +17,8 @@ */ #include "debug.h" -#include "EQPacket.h" -#include "EQStream.h" +#include "eq_packet.h" +#include "eq_stream.h" #include "misc.h" #include "Mutex.h" #include "op_codes.h" diff --git a/common/EQStream.h b/common/eq_stream.h similarity index 99% rename from common/EQStream.h rename to common/eq_stream.h index 2b32492d6..ed3e26623 100644 --- a/common/EQStream.h +++ b/common/eq_stream.h @@ -9,9 +9,9 @@ #ifndef WIN32 #include #endif -#include "EQStreamType.h" -#include "EQPacket.h" -#include "EQStreamIntf.h" +#include "eq_stream_type.h" +#include "eq_packet.h" +#include "eq_stream_intf.h" #include "Mutex.h" #include "../common/opcodemgr.h" #include "../common/misc.h" diff --git a/common/eq_stream_factory.cpp b/common/eq_stream_factory.cpp index 0eb6fe25f..bc3e2e2ba 100644 --- a/common/eq_stream_factory.cpp +++ b/common/eq_stream_factory.cpp @@ -1,5 +1,5 @@ #include "debug.h" -#include "EQStreamFactory.h" +#include "eq_stream_factory.h" #ifdef _WINDOWS #include #include @@ -16,7 +16,7 @@ #include #include #include "op_codes.h" -#include "EQStream.h" +#include "eq_stream.h" #include "logsys.h" ThreadReturnType EQStreamFactoryReaderLoop(void *eqfs) diff --git a/common/EQStreamFactory.h b/common/eq_stream_factory.h similarity index 97% rename from common/EQStreamFactory.h rename to common/eq_stream_factory.h index 8e2208152..7aa5d66ac 100644 --- a/common/EQStreamFactory.h +++ b/common/eq_stream_factory.h @@ -4,7 +4,7 @@ #include #include -#include "../common/EQStream.h" +#include "../common/eq_stream.h" #include "../common/condition.h" #include "../common/timeoutmgr.h" #include "../common/opcodemgr.h" diff --git a/common/eq_stream_ident.cpp b/common/eq_stream_ident.cpp index d4332c9a0..b60ac28d0 100644 --- a/common/eq_stream_ident.cpp +++ b/common/eq_stream_ident.cpp @@ -1,6 +1,6 @@ #include "debug.h" -#include "EQStreamIdent.h" -#include "EQStreamProxy.h" +#include "eq_stream_ident.h" +#include "eq_stream_proxy.h" #include "logsys.h" EQStreamIdentifier::~EQStreamIdentifier() { diff --git a/common/EQStreamIdent.h b/common/eq_stream_ident.h similarity index 97% rename from common/EQStreamIdent.h rename to common/eq_stream_ident.h index 855838c86..c038daf26 100644 --- a/common/EQStreamIdent.h +++ b/common/eq_stream_ident.h @@ -1,7 +1,7 @@ #ifndef EQSTREAMIDENT_H_ #define EQSTREAMIDENT_H_ -#include "EQStream.h" +#include "eq_stream.h" #include "timer.h" #include #include diff --git a/common/EQStreamIntf.h b/common/eq_stream_intf.h similarity index 100% rename from common/EQStreamIntf.h rename to common/eq_stream_intf.h diff --git a/common/EQStreamLocator.h b/common/eq_stream_locator.h similarity index 100% rename from common/EQStreamLocator.h rename to common/eq_stream_locator.h diff --git a/common/eq_stream_proxy.cpp b/common/eq_stream_proxy.cpp index 90ea6ffce..20fc4ea06 100644 --- a/common/eq_stream_proxy.cpp +++ b/common/eq_stream_proxy.cpp @@ -1,8 +1,8 @@ #include "debug.h" -#include "EQStreamProxy.h" -#include "EQStream.h" -#include "StructStrategy.h" +#include "eq_stream_proxy.h" +#include "eq_stream.h" +#include "struct_strategy.h" EQStreamProxy::EQStreamProxy(EQStream *&stream, const StructStrategy *structs, OpcodeManager **opcodes) diff --git a/common/EQStreamProxy.h b/common/eq_stream_proxy.h similarity index 98% rename from common/EQStreamProxy.h rename to common/eq_stream_proxy.h index cecdf9f38..34ea3a9fc 100644 --- a/common/EQStreamProxy.h +++ b/common/eq_stream_proxy.h @@ -3,7 +3,7 @@ #include "types.h" -#include "EQStreamIntf.h" +#include "eq_stream_intf.h" class EQStream; class StructStrategy; diff --git a/common/EQStreamType.h b/common/eq_stream_type.h similarity index 100% rename from common/EQStreamType.h rename to common/eq_stream_type.h diff --git a/common/eqemu_config.cpp b/common/eqemu_config.cpp index 1d0dadd15..165b0786f 100644 --- a/common/eqemu_config.cpp +++ b/common/eqemu_config.cpp @@ -17,7 +17,7 @@ */ #include "../common/debug.h" #include "eqemu_config.h" -#include "MiscFunctions.h" +#include "misc_functions.h" #include #include diff --git a/common/eqemu_config.h b/common/eqemu_config.h index 0a8cf833b..9fa21bea6 100644 --- a/common/eqemu_config.h +++ b/common/eqemu_config.h @@ -18,7 +18,7 @@ #ifndef __EQEmuConfig_H #define __EQEmuConfig_H -#include "XMLParser.h" +#include "xml_parser.h" #include "linked_list.h" struct LoginConfig { diff --git a/common/eqemu_error.cpp b/common/eqemu_error.cpp index 6dc5f9e96..79ce129ac 100644 --- a/common/eqemu_error.cpp +++ b/common/eqemu_error.cpp @@ -18,10 +18,10 @@ #ifdef _WINDOWS #include #endif -#include "EQEMuError.h" +#include "eqemu_error.h" #include "linked_list.h" #include "Mutex.h" -#include "MiscFunctions.h" +#include "misc_functions.h" #include #include #ifdef _WINDOWS diff --git a/common/EQEMuError.h b/common/eqemu_error.h similarity index 100% rename from common/EQEMuError.h rename to common/eqemu_error.h diff --git a/common/extprofile.h b/common/extprofile.h index 114983444..2e29fbf4a 100644 --- a/common/extprofile.h +++ b/common/extprofile.h @@ -19,7 +19,7 @@ #define EXTENDED_PROFILE_H #include "eq_packet_structs.h" -#include "Item.h" +#include "item.h" #pragma pack(1) diff --git a/common/guild_base.cpp b/common/guild_base.cpp index 717cb49c3..8f6144270 100644 --- a/common/guild_base.cpp +++ b/common/guild_base.cpp @@ -20,8 +20,8 @@ #include "guild_base.h" #include "database.h" #include "logsys.h" -//#include "MiscFunctions.h" -#include "StringUtil.h" +//#include "misc_functions.h" +#include "string_util.h" #include #include diff --git a/common/guilds.cpp b/common/guilds.cpp index 22b2ca240..4f5c08bb6 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 "MiscFunctions.h" +#include "misc_functions.h" #include "guilds.h" #include "database.h" #include "eq_packet_structs.h" diff --git a/common/item.cpp b/common/item.cpp index ff02d1574..7d6618335 100644 --- a/common/item.cpp +++ b/common/item.cpp @@ -17,8 +17,8 @@ */ #include "debug.h" -#include "StringUtil.h" -#include "Item.h" +#include "string_util.h" +#include "item.h" #include "database.h" #include "misc.h" #include "races.h" diff --git a/common/Item.h b/common/item.h similarity index 100% rename from common/Item.h rename to common/item.h diff --git a/common/logsys.cpp b/common/logsys.cpp index 7f04d01b8..2b90c8b4a 100644 --- a/common/logsys.cpp +++ b/common/logsys.cpp @@ -22,7 +22,7 @@ #include #include #include "misc.h" -#include "EQPacket.h" +#include "eq_packet.h" #define LOG_CATEGORY(category) #category , diff --git a/common/logsys_eqemu.cpp b/common/logsys_eqemu.cpp index e1e75996c..b5f846b4a 100644 --- a/common/logsys_eqemu.cpp +++ b/common/logsys_eqemu.cpp @@ -18,7 +18,7 @@ #include "debug.h" #include "logsys.h" -#include "StringUtil.h" +#include "string_util.h" #include #include diff --git a/common/md5.cpp b/common/md5.cpp index 8e9197e56..724279bba 100644 --- a/common/md5.cpp +++ b/common/md5.cpp @@ -9,7 +9,7 @@ */ #include /* for memcpy() */ #include "../common/md5.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/seperator.h" MD5::MD5() { diff --git a/common/misc_functions.cpp b/common/misc_functions.cpp index cf371adc1..e7b581733 100644 --- a/common/misc_functions.cpp +++ b/common/misc_functions.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" -#include "MiscFunctions.h" +#include "misc_functions.h" #include #include #include diff --git a/common/MiscFunctions.h b/common/misc_functions.h similarity index 100% rename from common/MiscFunctions.h rename to common/misc_functions.h diff --git a/common/mysql_request_result.cpp b/common/mysql_request_result.cpp index f364bf9b2..ffbc3ef40 100644 --- a/common/mysql_request_result.cpp +++ b/common/mysql_request_result.cpp @@ -1,4 +1,4 @@ -#include "MySQLRequestResult.h" +#include "mysql_request_result.h" MySQLRequestResult::MySQLRequestResult() diff --git a/common/MySQLRequestResult.h b/common/mysql_request_result.h similarity index 98% rename from common/MySQLRequestResult.h rename to common/mysql_request_result.h index 2983dd4bf..cd561be56 100644 --- a/common/MySQLRequestResult.h +++ b/common/mysql_request_result.h @@ -8,7 +8,7 @@ #include #include "types.h" -#include "MySQLRequestRow.h" +#include "mysql_request_row.h" #include #include #include diff --git a/common/mysql_request_row.cpp b/common/mysql_request_row.cpp index f8c2b4c06..ac5fa1592 100644 --- a/common/mysql_request_row.cpp +++ b/common/mysql_request_row.cpp @@ -1,4 +1,4 @@ -#include "MySQLRequestRow.h" +#include "mysql_request_row.h" MySQLRequestRow::MySQLRequestRow(const MySQLRequestRow& row) : m_Result(row.m_Result), m_MySQLRow(row.m_MySQLRow) diff --git a/common/MySQLRequestRow.h b/common/mysql_request_row.h similarity index 100% rename from common/MySQLRequestRow.h rename to common/mysql_request_row.h diff --git a/common/packet_dump.cpp b/common/packet_dump.cpp index a9c70b493..6bb412f6b 100644 --- a/common/packet_dump.cpp +++ b/common/packet_dump.cpp @@ -21,7 +21,7 @@ #include #include "packet_dump.h" -#include "EQPacket.h" +#include "eq_packet.h" #include "../common/servertalk.h" void DumpPacketAscii(const uchar* buf, uint32 size, uint32 cols, uint32 skip) { diff --git a/common/packet_dump_file.cpp b/common/packet_dump_file.cpp index 8e0e3c274..32aa7d984 100644 --- a/common/packet_dump_file.cpp +++ b/common/packet_dump_file.cpp @@ -35,7 +35,7 @@ #include #endif -#include "EQStream.h" +#include "eq_stream.h" #include "packet_dump_file.h" void FileDumpPacketAscii(const char* filename, const uchar* buf, uint32 size, uint32 cols, uint32 skip) { diff --git a/common/patches/client62.cpp b/common/patches/client62.cpp index 8e45217e5..10cc331ec 100644 --- a/common/patches/client62.cpp +++ b/common/patches/client62.cpp @@ -1,17 +1,17 @@ #include "../debug.h" -#include "Client62.h" +#include "client62.h" #include "../opcodemgr.h" #include "../logsys.h" -#include "../EQStreamIdent.h" +#include "../eq_stream_ident.h" #include "../crc32.h" #include "../eq_packet_structs.h" -#include "../MiscFunctions.h" -#include "../StringUtil.h" -#include "../Item.h" +#include "../misc_functions.h" +#include "../string_util.h" +#include "../item.h" #include "../clientversions.h" -#include "Client62_structs.h" +#include "client62_structs.h" namespace Client62 { @@ -84,8 +84,8 @@ Strategy::Strategy() : StructStrategy() { //all opcodes default to passthrough. - #include "SSRegister.h" - #include "Client62_ops.h" + #include "ss_register.h" + #include "client62_ops.h" } std::string Strategy::Describe() const { @@ -100,7 +100,7 @@ const EQClientVersion Strategy::ClientVersion() const return EQClient62; } -#include "SSDefine.h" +#include "ss_define.h" /* @@ -1042,7 +1042,7 @@ char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 d #define C(field) "|%s" #define S(field) "|%s" #define F(field) "|%f" -#include "Client62_itemfields.h" +#include "client62_itemfields.h" "%.*s\"" // Quotes (and protection, if needed) around static data "|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s" // Sub items "%.*s%s" // For trailing quotes (and protection) if a subitem; @@ -1054,7 +1054,7 @@ char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 d #define C(field) ,field #define S(field) ,item->field #define F(field) ,item->field -#include "Client62_itemfields.h" +#include "client62_itemfields.h" ,depth,protection ,sub_items[0] ? sub_items[0] : "" ,sub_items[1] ? sub_items[1] : "" diff --git a/common/patches/Client62.h b/common/patches/client62.h similarity index 84% rename from common/patches/Client62.h rename to common/patches/client62.h index f4a70bc90..08d1a9716 100644 --- a/common/patches/Client62.h +++ b/common/patches/client62.h @@ -1,8 +1,8 @@ #ifndef CLIENT62_H_ #define CLIENT62_H_ -#include "../StructStrategy.h" -#include "../Item.h" +#include "../struct_strategy.h" +#include "../item.h" class EQStreamIdentifier; @@ -27,8 +27,8 @@ namespace Client62 { virtual const EQClientVersion ClientVersion() const; //magic macro to declare our opcode processors - #include "SSDeclare.h" - #include "Client62_ops.h" + #include "ss_declare.h" + #include "client62_ops.h" }; diff --git a/common/patches/Client62_constants.h b/common/patches/client62_constants.h similarity index 100% rename from common/patches/Client62_constants.h rename to common/patches/client62_constants.h diff --git a/common/patches/Client62_itemfields.h b/common/patches/client62_itemfields.h similarity index 100% rename from common/patches/Client62_itemfields.h rename to common/patches/client62_itemfields.h diff --git a/common/patches/Client62_ops.h b/common/patches/client62_ops.h similarity index 100% rename from common/patches/Client62_ops.h rename to common/patches/client62_ops.h diff --git a/common/patches/Client62_structs.h b/common/patches/client62_structs.h similarity index 100% rename from common/patches/Client62_structs.h rename to common/patches/client62_structs.h diff --git a/common/patches/patches.cpp b/common/patches/patches.cpp index febb344d7..212042210 100644 --- a/common/patches/patches.cpp +++ b/common/patches/patches.cpp @@ -2,13 +2,13 @@ #include "../debug.h" #include "patches.h" -#include "Client62.h" -#include "Titanium.h" -#include "Underfoot.h" -#include "SoF.h" -#include "SoD.h" -#include "RoF.h" -//#include "RoF2.h" +#include "client62.h" +#include "titanium.h" +#include "underfoot.h" +#include "sof.h" +#include "sod.h" +#include "rof.h" +//#include "rof2.h" void RegisterAllPatches(EQStreamIdentifier &into) { Client62::Register(into); diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp index 7fcce53b2..90ff9ab9e 100644 --- a/common/patches/rof.cpp +++ b/common/patches/rof.cpp @@ -1,16 +1,16 @@ #include "../debug.h" -#include "RoF.h" +#include "rof.h" #include "../opcodemgr.h" #include "../logsys.h" -#include "../EQStreamIdent.h" +#include "../eq_stream_ident.h" #include "../crc32.h" #include "../eq_packet_structs.h" -#include "../MiscFunctions.h" -#include "../StringUtil.h" -#include "../Item.h" -#include "RoF_structs.h" +#include "../misc_functions.h" +#include "../string_util.h" +#include "../item.h" +#include "rof_structs.h" #include "../rulesys.h" #include @@ -89,8 +89,8 @@ Strategy::Strategy() : StructStrategy() { //all opcodes default to passthrough. - #include "SSRegister.h" - #include "RoF_ops.h" + #include "ss_register.h" + #include "rof_ops.h" } std::string Strategy::Describe() const { @@ -105,7 +105,7 @@ const EQClientVersion Strategy::ClientVersion() const return EQClientRoF; } -#include "SSDefine.h" +#include "ss_define.h" // Converts Server Slot IDs to RoF Slot IDs for use in Encodes diff --git a/common/patches/RoF.h b/common/patches/rof.h similarity index 87% rename from common/patches/RoF.h rename to common/patches/rof.h index fc2e94c95..220341970 100644 --- a/common/patches/RoF.h +++ b/common/patches/rof.h @@ -1,7 +1,7 @@ #ifndef RoF_H_ #define RoF_H_ -#include "../StructStrategy.h" +#include "../struct_strategy.h" class EQStreamIdentifier; @@ -26,8 +26,8 @@ namespace RoF { virtual const EQClientVersion ClientVersion() const; //magic macro to declare our opcode processors - #include "SSDeclare.h" - #include "RoF_ops.h" + #include "ss_declare.h" + #include "rof_ops.h" }; }; diff --git a/common/patches/RoF_constants.h b/common/patches/rof_constants.h similarity index 100% rename from common/patches/RoF_constants.h rename to common/patches/rof_constants.h diff --git a/common/patches/RoF_itemfields.h b/common/patches/rof_itemfields.h similarity index 100% rename from common/patches/RoF_itemfields.h rename to common/patches/rof_itemfields.h diff --git a/common/patches/RoF_ops.h b/common/patches/rof_ops.h similarity index 100% rename from common/patches/RoF_ops.h rename to common/patches/rof_ops.h diff --git a/common/patches/RoF_structs.h b/common/patches/rof_structs.h similarity index 100% rename from common/patches/RoF_structs.h rename to common/patches/rof_structs.h diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp index dcc95ec75..db2f1f989 100644 --- a/common/patches/sod.cpp +++ b/common/patches/sod.cpp @@ -1,16 +1,16 @@ #include "../debug.h" -#include "SoD.h" +#include "sod.h" #include "../opcodemgr.h" #include "../logsys.h" -#include "../EQStreamIdent.h" +#include "../eq_stream_ident.h" #include "../crc32.h" #include "../eq_packet_structs.h" -#include "../MiscFunctions.h" -#include "../StringUtil.h" -#include "../Item.h" -#include "SoD_structs.h" +#include "../misc_functions.h" +#include "../string_util.h" +#include "../item.h" +#include "sod_structs.h" #include "../rulesys.h" #include @@ -89,8 +89,8 @@ Strategy::Strategy() : StructStrategy() { //all opcodes default to passthrough. - #include "SSRegister.h" - #include "SoD_ops.h" + #include "ss_register.h" + #include "sod_ops.h" } std::string Strategy::Describe() const { @@ -105,7 +105,7 @@ const EQClientVersion Strategy::ClientVersion() const return EQClientSoD; } -#include "SSDefine.h" +#include "ss_define.h" // Converts Server Slot IDs to SoD Slot IDs for use in Encodes diff --git a/common/patches/SoD.h b/common/patches/sod.h similarity index 87% rename from common/patches/SoD.h rename to common/patches/sod.h index 960cd2afa..0377573c2 100644 --- a/common/patches/SoD.h +++ b/common/patches/sod.h @@ -1,7 +1,7 @@ #ifndef SoD_H_ #define SoD_H_ -#include "../StructStrategy.h" +#include "../struct_strategy.h" class EQStreamIdentifier; @@ -26,8 +26,8 @@ namespace SoD { virtual const EQClientVersion ClientVersion() const; //magic macro to declare our opcode processors - #include "SSDeclare.h" - #include "SoD_ops.h" + #include "ss_declare.h" + #include "sod_ops.h" }; }; diff --git a/common/patches/SoD_constants.h b/common/patches/sod_constants.h similarity index 100% rename from common/patches/SoD_constants.h rename to common/patches/sod_constants.h diff --git a/common/patches/SoD_itemfields.h b/common/patches/sod_itemfields.h similarity index 100% rename from common/patches/SoD_itemfields.h rename to common/patches/sod_itemfields.h diff --git a/common/patches/SoD_ops.h b/common/patches/sod_ops.h similarity index 100% rename from common/patches/SoD_ops.h rename to common/patches/sod_ops.h diff --git a/common/patches/SoD_structs.h b/common/patches/sod_structs.h similarity index 100% rename from common/patches/SoD_structs.h rename to common/patches/sod_structs.h diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp index d607ff472..4116d3251 100644 --- a/common/patches/sof.cpp +++ b/common/patches/sof.cpp @@ -1,15 +1,15 @@ #include "../debug.h" -#include "SoF.h" +#include "sof.h" #include "../opcodemgr.h" #include "../logsys.h" -#include "../EQStreamIdent.h" +#include "../eq_stream_ident.h" #include "../crc32.h" #include "../eq_packet_structs.h" -#include "../StringUtil.h" -#include "../Item.h" -#include "SoF_structs.h" +#include "../string_util.h" +#include "../item.h" +#include "sof_structs.h" #include "../rulesys.h" #include @@ -88,8 +88,8 @@ Strategy::Strategy() : StructStrategy() { //all opcodes default to passthrough. - #include "SSRegister.h" - #include "SoF_ops.h" + #include "ss_register.h" + #include "sof_ops.h" } std::string Strategy::Describe() const { @@ -104,7 +104,7 @@ const EQClientVersion Strategy::ClientVersion() const return EQClientSoF; } -#include "SSDefine.h" +#include "ss_define.h" // Converts Server Slot IDs to SoF Slot IDs for use in Encodes diff --git a/common/patches/SoF.h b/common/patches/sof.h similarity index 87% rename from common/patches/SoF.h rename to common/patches/sof.h index 615bc1f99..fc68ba334 100644 --- a/common/patches/SoF.h +++ b/common/patches/sof.h @@ -1,7 +1,7 @@ #ifndef SoF_H_ #define SoF_H_ -#include "../StructStrategy.h" +#include "../struct_strategy.h" class EQStreamIdentifier; @@ -26,8 +26,8 @@ namespace SoF { virtual const EQClientVersion ClientVersion() const; //magic macro to declare our opcode processors - #include "SSDeclare.h" - #include "SoF_ops.h" + #include "ss_declare.h" + #include "sof_ops.h" }; }; diff --git a/common/patches/SoF_constants.h b/common/patches/sof_constants.h similarity index 100% rename from common/patches/SoF_constants.h rename to common/patches/sof_constants.h diff --git a/common/patches/SoF_itemfields.h b/common/patches/sof_itemfields.h similarity index 100% rename from common/patches/SoF_itemfields.h rename to common/patches/sof_itemfields.h diff --git a/common/patches/SoF_ops.h b/common/patches/sof_ops.h similarity index 100% rename from common/patches/SoF_ops.h rename to common/patches/sof_ops.h diff --git a/common/patches/SoF_structs.h b/common/patches/sof_structs.h similarity index 100% rename from common/patches/SoF_structs.h rename to common/patches/sof_structs.h diff --git a/common/patches/SSDeclare.h b/common/patches/ss_declare.h similarity index 100% rename from common/patches/SSDeclare.h rename to common/patches/ss_declare.h diff --git a/common/patches/SSDefine.h b/common/patches/ss_define.h similarity index 100% rename from common/patches/SSDefine.h rename to common/patches/ss_define.h diff --git a/common/patches/SSRegister.h b/common/patches/ss_register.h similarity index 100% rename from common/patches/SSRegister.h rename to common/patches/ss_register.h diff --git a/common/patches/template.cpp b/common/patches/template.cpp index 219e30f71..8c4be992c 100644 --- a/common/patches/template.cpp +++ b/common/patches/template.cpp @@ -2,7 +2,7 @@ #include "TEMPLATE.h" #include "../opcodemgr.h" #include "../logsys.h" -#include "../EQStreamIdent.h" +#include "../eq_stream_ident.h" #include "../eq_packet_structs.h" #include "TEMPLATE_structs.h" @@ -68,7 +68,7 @@ Strategy::Strategy() : StructStrategy() { //all opcodes default to passthrough. - #include "SSRegister.h" + #include "ss_register.h" #include "TEMPLATE_ops.h" } @@ -80,7 +80,7 @@ std::string Strategy::Describe() const { } -#include "SSDefine.h" +#include "ss_define.h" /*ENCODE(OP_PlayerProfile) { diff --git a/common/patches/template.h b/common/patches/template.h index 16f869fc1..1391516b1 100644 --- a/common/patches/template.h +++ b/common/patches/template.h @@ -1,7 +1,7 @@ #ifndef TEMPLATE_H_ #define TEMPLATE_H_ -#include "../StructStrategy.h" +#include "../struct_strategy.h" class EQStreamIdentifier; @@ -25,7 +25,7 @@ namespace TEMPLATE { virtual std::string Describe() const; virtual const EQClientVersion ClientVersion() const; //magic macro to declare our opcodes - #include "SSDeclare.h" + #include "ss_declare.h" #include "TEMPLATE_ops.h" }; diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index ea44c3c38..c79fa5d4f 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -1,16 +1,16 @@ #include "../debug.h" -#include "Titanium.h" +#include "titanium.h" #include "../opcodemgr.h" #include "../logsys.h" -#include "../EQStreamIdent.h" +#include "../eq_stream_ident.h" #include "../crc32.h" #include "../races.h" #include "../eq_packet_structs.h" -#include "../StringUtil.h" -#include "../Item.h" -#include "Titanium_structs.h" +#include "../string_util.h" +#include "../item.h" +#include "titanium_structs.h" #include namespace Titanium { @@ -86,8 +86,8 @@ Strategy::Strategy() : StructStrategy() { //all opcodes default to passthrough. - #include "SSRegister.h" - #include "Titanium_ops.h" + #include "ss_register.h" + #include "titanium_ops.h" } std::string Strategy::Describe() const { @@ -102,7 +102,7 @@ const EQClientVersion Strategy::ClientVersion() const return EQClientTitanium; } -#include "SSDefine.h" +#include "ss_define.h" /* @@ -1460,7 +1460,7 @@ char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 d #define C(field) "|%s" #define S(field) "|%s" #define F(field) "|%f" -#include "Titanium_itemfields.h" +#include "titanium_itemfields.h" "%.*s\"" // Quotes (and protection, if needed) around static data "|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s" // Sub items "%.*s%s" // For trailing quotes (and protection) if a subitem; @@ -1472,7 +1472,7 @@ char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 d #define C(field) ,field #define S(field) ,item->field #define F(field) ,item->field -#include "Titanium_itemfields.h" +#include "titanium_itemfields.h" ,depth,protection ,sub_items[0] ? sub_items[0] : "" ,sub_items[1] ? sub_items[1] : "" diff --git a/common/patches/Titanium.h b/common/patches/titanium.h similarity index 87% rename from common/patches/Titanium.h rename to common/patches/titanium.h index 337556938..421ef319a 100644 --- a/common/patches/Titanium.h +++ b/common/patches/titanium.h @@ -1,7 +1,7 @@ #ifndef Titanium_H_ #define Titanium_H_ -#include "../StructStrategy.h" +#include "../struct_strategy.h" class EQStreamIdentifier; @@ -26,8 +26,8 @@ namespace Titanium { virtual const EQClientVersion ClientVersion() const; //magic macro to declare our opcode processors - #include "SSDeclare.h" - #include "Titanium_ops.h" + #include "ss_declare.h" + #include "titanium_ops.h" }; }; diff --git a/common/patches/Titanium_constants.h b/common/patches/titanium_constants.h similarity index 100% rename from common/patches/Titanium_constants.h rename to common/patches/titanium_constants.h diff --git a/common/patches/Titanium_itemfields.h b/common/patches/titanium_itemfields.h similarity index 100% rename from common/patches/Titanium_itemfields.h rename to common/patches/titanium_itemfields.h diff --git a/common/patches/Titanium_ops.h b/common/patches/titanium_ops.h similarity index 100% rename from common/patches/Titanium_ops.h rename to common/patches/titanium_ops.h diff --git a/common/patches/Titanium_structs.h b/common/patches/titanium_structs.h similarity index 100% rename from common/patches/Titanium_structs.h rename to common/patches/titanium_structs.h diff --git a/common/patches/underfoot.cpp b/common/patches/underfoot.cpp index b56d3f511..bdac3c72b 100644 --- a/common/patches/underfoot.cpp +++ b/common/patches/underfoot.cpp @@ -1,16 +1,16 @@ #include "../debug.h" -#include "Underfoot.h" +#include "underfoot.h" #include "../opcodemgr.h" #include "../logsys.h" -#include "../EQStreamIdent.h" +#include "../eq_stream_ident.h" #include "../crc32.h" #include "../eq_packet_structs.h" -#include "../MiscFunctions.h" -#include "../StringUtil.h" -#include "../Item.h" -#include "Underfoot_structs.h" +#include "../misc_functions.h" +#include "../string_util.h" +#include "../item.h" +#include "underfoot_structs.h" #include "../rulesys.h" #include @@ -90,8 +90,8 @@ Strategy::Strategy() : StructStrategy() { //all opcodes default to passthrough. - #include "SSRegister.h" - #include "Underfoot_ops.h" + #include "ss_register.h" + #include "underfoot_ops.h" } std::string Strategy::Describe() const { @@ -106,7 +106,7 @@ const EQClientVersion Strategy::ClientVersion() const return EQClientUnderfoot; } -#include "SSDefine.h" +#include "ss_define.h" // Converts Server Slot IDs to Underfoot Slot IDs for use in Encodes diff --git a/common/patches/Underfoot.h b/common/patches/underfoot.h similarity index 87% rename from common/patches/Underfoot.h rename to common/patches/underfoot.h index fb66a3488..b14d4a420 100644 --- a/common/patches/Underfoot.h +++ b/common/patches/underfoot.h @@ -1,7 +1,7 @@ #ifndef Underfoot_H_ #define Underfoot_H_ -#include "../StructStrategy.h" +#include "../struct_strategy.h" class EQStreamIdentifier; @@ -26,8 +26,8 @@ namespace Underfoot { virtual const EQClientVersion ClientVersion() const; //magic macro to declare our opcode processors - #include "SSDeclare.h" - #include "Underfoot_ops.h" + #include "ss_declare.h" + #include "underfoot_ops.h" }; }; diff --git a/common/patches/Underfoot_constants.h b/common/patches/underfoot_constants.h similarity index 100% rename from common/patches/Underfoot_constants.h rename to common/patches/underfoot_constants.h diff --git a/common/patches/Underfoot_itemfields.h b/common/patches/underfoot_itemfields.h similarity index 100% rename from common/patches/Underfoot_itemfields.h rename to common/patches/underfoot_itemfields.h diff --git a/common/patches/Underfoot_ops.h b/common/patches/underfoot_ops.h similarity index 100% rename from common/patches/Underfoot_ops.h rename to common/patches/underfoot_ops.h diff --git a/common/patches/Underfoot_structs.h b/common/patches/underfoot_structs.h similarity index 100% rename from common/patches/Underfoot_structs.h rename to common/patches/underfoot_structs.h diff --git a/common/proc_launcher.cpp b/common/proc_launcher.cpp index da0cd81e9..0ea0d9636 100644 --- a/common/proc_launcher.cpp +++ b/common/proc_launcher.cpp @@ -20,7 +20,7 @@ #include #include "debug.h" -#include "ProcLauncher.h" +#include "proc_launcher.h" #ifdef _WINDOWS #include #else diff --git a/common/ProcLauncher.h b/common/proc_launcher.h similarity index 100% rename from common/ProcLauncher.h rename to common/proc_launcher.h diff --git a/common/ptimer.cpp b/common/ptimer.cpp index 1e1aa7349..c9b25b1a5 100644 --- a/common/ptimer.cpp +++ b/common/ptimer.cpp @@ -20,7 +20,7 @@ #include "timer.h" #include "ptimer.h" #include "database.h" -#include "StringUtil.h" +#include "string_util.h" #include #include #include diff --git a/common/rulesys.cpp b/common/rulesys.cpp index f23d482b3..95f22754c 100644 --- a/common/rulesys.cpp +++ b/common/rulesys.cpp @@ -19,7 +19,7 @@ #include "rulesys.h" #include "logsys.h" #include "database.h" -#include "StringUtil.h" +#include "string_util.h" #include #include diff --git a/common/shareddb.cpp b/common/shareddb.cpp index 7a9858789..8e999da54 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -4,11 +4,11 @@ #include "shareddb.h" #include "mysql.h" -#include "Item.h" +#include "item.h" #include "classes.h" #include "rulesys.h" #include "seperator.h" -#include "StringUtil.h" +#include "string_util.h" #include "eq_packet_structs.h" #include "guilds.h" #include "extprofile.h" diff --git a/common/shareddb.h b/common/shareddb.h index 05c3db6ef..0fd72426c 100644 --- a/common/shareddb.h +++ b/common/shareddb.h @@ -6,7 +6,7 @@ #include "database.h" #include "skills.h" #include "spdat.h" -#include "Item.h" +#include "item.h" #include "base_data.h" #include "fixed_memory_hash_set.h" #include "fixed_memory_variable_hash_set.h" diff --git a/common/spdat.cpp b/common/spdat.cpp index 8e93f4e1f..1ff8f2696 100644 --- a/common/spdat.cpp +++ b/common/spdat.cpp @@ -74,7 +74,7 @@ #include "spdat.h" #include "packet_dump.h" #include "moremath.h" -#include "Item.h" +#include "item.h" #include "skills.h" #include "bodytypes.h" #include "classes.h" diff --git a/common/string_util.cpp b/common/string_util.cpp index 80c92fa88..0ccd0e4ef 100644 --- a/common/string_util.cpp +++ b/common/string_util.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "StringUtil.h" +#include "string_util.h" #include // for strncpy #include diff --git a/common/StringUtil.h b/common/string_util.h similarity index 100% rename from common/StringUtil.h rename to common/string_util.h diff --git a/common/struct_strategy.cpp b/common/struct_strategy.cpp index 9056fad72..9507fd231 100644 --- a/common/struct_strategy.cpp +++ b/common/struct_strategy.cpp @@ -1,8 +1,8 @@ #include "debug.h" -#include "StructStrategy.h" +#include "struct_strategy.h" #include "logsys.h" -#include "EQStream.h" +#include "eq_stream.h" #include diff --git a/common/StructStrategy.h b/common/struct_strategy.h similarity index 100% rename from common/StructStrategy.h rename to common/struct_strategy.h diff --git a/common/TCPBasicServer.h b/common/tcp_basic_server.h similarity index 89% rename from common/TCPBasicServer.h rename to common/tcp_basic_server.h index 3a01051d3..1d317bc8f 100644 --- a/common/TCPBasicServer.h +++ b/common/tcp_basic_server.h @@ -1,8 +1,8 @@ #ifndef TCPBASICSERVER_H_ #define TCPBASICSERVER_H_ -#include "TCPServer.h" -#include "TCPConnection.h" +#include "tcp_server.h" +#include "tcp_connection.h" class TCPBasicServer : public TCPServer { public: diff --git a/common/tcp_connection.cpp b/common/tcp_connection.cpp index 1e5f49600..ea57a6301 100644 --- a/common/tcp_connection.cpp +++ b/common/tcp_connection.cpp @@ -22,7 +22,7 @@ #include #include -#include "TCPConnection.h" +#include "tcp_connection.h" #include "../common/servertalk.h" #include "../common/timer.h" #include "../common/packet_dump.h" diff --git a/common/TCPConnection.h b/common/tcp_connection.h similarity index 99% rename from common/TCPConnection.h rename to common/tcp_connection.h index 5321c5e3a..fbf34491c 100644 --- a/common/TCPConnection.h +++ b/common/tcp_connection.h @@ -46,7 +46,7 @@ #include "types.h" #include "Mutex.h" #include "queue.h" -#include "MiscFunctions.h" +#include "misc_functions.h" class BaseTCPServer; class ServerPacket; diff --git a/common/tcp_server.cpp b/common/tcp_server.cpp index 2e3abfe2f..415f76fa1 100644 --- a/common/tcp_server.cpp +++ b/common/tcp_server.cpp @@ -1,5 +1,5 @@ #include "debug.h" -#include "TCPServer.h" +#include "tcp_server.h" #include #include #include diff --git a/common/TCPServer.h b/common/tcp_server.h similarity index 100% rename from common/TCPServer.h rename to common/tcp_server.h diff --git a/common/xml_parser.cpp b/common/xml_parser.cpp index f6f64ed13..7f84e0d47 100644 --- a/common/xml_parser.cpp +++ b/common/xml_parser.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" -#include "XMLParser.h" +#include "xml_parser.h" XMLParser::XMLParser() { ParseOkay = false; diff --git a/common/XMLParser.h b/common/xml_parser.h similarity index 100% rename from common/XMLParser.h rename to common/xml_parser.h diff --git a/common/ZoneNumbers.h b/common/zone_numbers.h similarity index 100% rename from common/ZoneNumbers.h rename to common/zone_numbers.h diff --git a/eqlaunch/ZoneLaunch.h b/eqlaunch/ZoneLaunch.h index 2694e5bd5..3dc0fd697 100644 --- a/eqlaunch/ZoneLaunch.h +++ b/eqlaunch/ZoneLaunch.h @@ -18,7 +18,7 @@ #ifndef ZONELAUNCH_H_ #define ZONELAUNCH_H_ -#include "../common/ProcLauncher.h" +#include "../common/proc_launcher.h" #include "../common/timer.h" #include diff --git a/eqlaunch/eqlaunch.cpp b/eqlaunch/eqlaunch.cpp index 58db80cb8..da14c40e8 100644 --- a/eqlaunch/eqlaunch.cpp +++ b/eqlaunch/eqlaunch.cpp @@ -17,7 +17,7 @@ */ #include "../common/debug.h" -#include "../common/ProcLauncher.h" +#include "../common/proc_launcher.h" #include "../common/eqemu_config.h" #include "../common/servertalk.h" #include "../common/platform.h" diff --git a/eqlaunch/worldserver.cpp b/eqlaunch/worldserver.cpp index 5872e17d5..7b542a183 100644 --- a/eqlaunch/worldserver.cpp +++ b/eqlaunch/worldserver.cpp @@ -20,7 +20,7 @@ #include "../common/servertalk.h" #include "ZoneLaunch.h" #include "../common/eqemu_config.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" WorldServer::WorldServer(std::map &zones, const char *name, const EQEmuConfig *config) diff --git a/loginserver/Client.cpp b/loginserver/Client.cpp index 9fd96118a..98128e286 100644 --- a/loginserver/Client.cpp +++ b/loginserver/Client.cpp @@ -19,7 +19,7 @@ #include "ErrorLog.h" #include "LoginServer.h" #include "LoginStructures.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" extern ErrorLog *server_log; extern LoginServer server; diff --git a/loginserver/Client.h b/loginserver/Client.h index 1cb248344..d080aa01b 100644 --- a/loginserver/Client.h +++ b/loginserver/Client.h @@ -20,8 +20,8 @@ #include "../common/debug.h" #include "../common/opcodemgr.h" -#include "../common/EQStreamType.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_type.h" +#include "../common/eq_stream_factory.h" #ifndef WIN32 #include "EQCryptoAPI.h" #endif diff --git a/loginserver/ClientManager.h b/loginserver/ClientManager.h index 287a9212d..fc6205a8a 100644 --- a/loginserver/ClientManager.h +++ b/loginserver/ClientManager.h @@ -20,8 +20,8 @@ #include "../common/debug.h" #include "../common/opcodemgr.h" -#include "../common/EQStreamType.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_type.h" +#include "../common/eq_stream_factory.h" #include "Client.h" #include diff --git a/loginserver/Main.cpp b/loginserver/Main.cpp index 54a3e9ba4..ec5a3b4ed 100644 --- a/loginserver/Main.cpp +++ b/loginserver/Main.cpp @@ -18,7 +18,7 @@ #include "../common/debug.h" #include "../common/types.h" #include "../common/opcodemgr.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_factory.h" #include "../common/timer.h" #include "../common/platform.h" #include "../common/crash.h" diff --git a/loginserver/ServerManager.h b/loginserver/ServerManager.h index 8bfd8c8ee..3d03db06d 100644 --- a/loginserver/ServerManager.h +++ b/loginserver/ServerManager.h @@ -19,7 +19,7 @@ #define EQEMU_SERVERMANAGER_H #include "../common/debug.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_factory.h" #include "../common/emu_tcp_connection.h" #include "../common/emu_tcp_server.h" #include "../common/servertalk.h" diff --git a/loginserver/WorldServer.h b/loginserver/WorldServer.h index 655cbc578..ff790e103 100644 --- a/loginserver/WorldServer.h +++ b/loginserver/WorldServer.h @@ -19,7 +19,7 @@ #define EQEMU_WORLDSERVER_H #include "../common/debug.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_factory.h" #include "../common/emu_tcp_connection.h" #include "../common/emu_tcp_server.h" #include "../common/servertalk.h" diff --git a/queryserv/database.cpp b/queryserv/database.cpp index 14d4c34a9..d03957140 100644 --- a/queryserv/database.cpp +++ b/queryserv/database.cpp @@ -43,7 +43,7 @@ #include "database.h" #include "../common/eq_packet_structs.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/servertalk.h" Database::Database () diff --git a/queryserv/lfguild.cpp b/queryserv/lfguild.cpp index a98c23ddc..9fc4d0b62 100644 --- a/queryserv/lfguild.cpp +++ b/queryserv/lfguild.cpp @@ -2,7 +2,7 @@ #include "lfguild.h" #include "database.h" #include "worldserver.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/packet_dump.h" #include "../common/rulesys.h" diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp index 30dc9970e..3827ceea1 100644 --- a/queryserv/queryserv.cpp +++ b/queryserv/queryserv.cpp @@ -19,7 +19,7 @@ #include "../common/debug.h" #include "../common/opcodemgr.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_factory.h" #include "../common/rulesys.h" #include "../common/servertalk.h" #include "../common/platform.h" diff --git a/socket_server/database.cpp b/socket_server/database.cpp index a2c04bbb4..d27079af0 100644 --- a/socket_server/database.cpp +++ b/socket_server/database.cpp @@ -43,7 +43,7 @@ #include "database.h" #include "../common/eq_packet_structs.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/servertalk.h" Database::Database () diff --git a/socket_server/socket_server.cpp b/socket_server/socket_server.cpp index 997d9965f..71c8342ff 100644 --- a/socket_server/socket_server.cpp +++ b/socket_server/socket_server.cpp @@ -39,7 +39,7 @@ using websocketpp::lib::condition_variable; #include "../common/debug.h" #include "../common/opcodemgr.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_factory.h" #include "../common/rulesys.h" #include "../common/servertalk.h" #include "../common/platform.h" diff --git a/tests/atobool_test.h b/tests/atobool_test.h index ce02df02d..5cc9ad872 100644 --- a/tests/atobool_test.h +++ b/tests/atobool_test.h @@ -20,7 +20,7 @@ #define __EQEMU_TESTS_ATOBOOL_H #include "cppunit/cpptest.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" class atoboolTest : public Test::Suite { typedef void(atoboolTest::*TestFunction)(void); diff --git a/tests/fixed_memory_test.h b/tests/fixed_memory_test.h index 089b8f7c0..fcff0c9e8 100644 --- a/tests/fixed_memory_test.h +++ b/tests/fixed_memory_test.h @@ -21,7 +21,7 @@ #include "cppunit/cpptest.h" #include "../common/fixed_memory_hash_set.h" -#include "../common/Item.h" +#include "../common/item.h" class FixedMemoryHashTest : public Test::Suite { typedef void(FixedMemoryHashTest::*TestFunction)(void); diff --git a/tests/hextoi_32_64_test.h b/tests/hextoi_32_64_test.h index eda5e7fc2..1ad6c9d24 100644 --- a/tests/hextoi_32_64_test.h +++ b/tests/hextoi_32_64_test.h @@ -20,7 +20,7 @@ #define __EQEMU_TESTS_HEXTOI_32_64_H #include "cppunit/cpptest.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" class hextoi_32_64_Test : public Test::Suite { typedef void(hextoi_32_64_Test::*TestFunction)(void); diff --git a/ucs/chatchannel.cpp b/ucs/chatchannel.cpp index a33ad65db..56b7eb5b9 100644 --- a/ucs/chatchannel.cpp +++ b/ucs/chatchannel.cpp @@ -20,7 +20,7 @@ #include "chatchannel.h" #include "clientlist.h" #include "database.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include extern Database database; diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index 31d54e3b5..8a60fc749 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -18,13 +18,13 @@ */ #include "../common/debug.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "clientlist.h" #include "database.h" #include "chatchannel.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_factory.h" #include "../common/emu_tcp_connection.h" #include "../common/emu_tcp_server.h" #include diff --git a/ucs/clientlist.h b/ucs/clientlist.h index b8a1609ea..266986542 100644 --- a/ucs/clientlist.h +++ b/ucs/clientlist.h @@ -21,8 +21,8 @@ #define CHATSERVER_CLIENTLIST_H #include "../common/opcodemgr.h" -#include "../common/EQStreamType.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_type.h" +#include "../common/eq_stream_factory.h" #include "../common/rulesys.h" #include "chatchannel.h" #include diff --git a/ucs/database.cpp b/ucs/database.cpp index 4e41a3180..4d055e2a4 100644 --- a/ucs/database.cpp +++ b/ucs/database.cpp @@ -43,8 +43,8 @@ #include "database.h" #include "../common/eq_packet_structs.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "chatchannel.h" extern Clientlist *CL; diff --git a/ucs/ucs.cpp b/ucs/ucs.cpp index 322b58983..46d898f6b 100644 --- a/ucs/ucs.cpp +++ b/ucs/ucs.cpp @@ -20,7 +20,7 @@ #include "../common/debug.h" #include "clientlist.h" #include "../common/opcodemgr.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream_factory.h" #include "../common/rulesys.h" #include "../common/servertalk.h" #include "../common/platform.h" diff --git a/utils/player_profile_set/player_profile_set/MiscFunctions.cpp b/utils/player_profile_set/player_profile_set/MiscFunctions.cpp index 5af82a611..aae237489 100644 --- a/utils/player_profile_set/player_profile_set/MiscFunctions.cpp +++ b/utils/player_profile_set/player_profile_set/MiscFunctions.cpp @@ -1,4 +1,4 @@ -#include "MiscFunctions.h" +#include "misc_functions.h" #include #include #include diff --git a/utils/player_profile_set/player_profile_set/database.h b/utils/player_profile_set/player_profile_set/database.h index 499449634..cc82333d9 100644 --- a/utils/player_profile_set/player_profile_set/database.h +++ b/utils/player_profile_set/player_profile_set/database.h @@ -1,7 +1,7 @@ #if !defined(_L__EQDATAB__H) #define _L__EQDATAB__H -#include "MiscFunctions.h" +#include "misc_functions.h" #ifdef WIN32 #include diff --git a/world/Adventure.cpp b/world/Adventure.cpp index 162c4563b..b66735176 100644 --- a/world/Adventure.cpp +++ b/world/Adventure.cpp @@ -2,8 +2,8 @@ #include "../common/servertalk.h" #include "../common/extprofile.h" #include "../common/rulesys.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "Adventure.h" #include "AdventureManager.h" #include "worlddb.h" diff --git a/world/AdventureManager.cpp b/world/AdventureManager.cpp index 5768bb9b2..33ac522b8 100644 --- a/world/AdventureManager.cpp +++ b/world/AdventureManager.cpp @@ -1,6 +1,6 @@ #include "../common/debug.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/servertalk.h" #include "../common/rulesys.h" #include "Adventure.h" diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt index ca48ea610..7d4e2adeb 100644 --- a/world/CMakeLists.txt +++ b/world/CMakeLists.txt @@ -53,7 +53,7 @@ SET(world_headers LoginServerList.h net.h queryserv.h - SoFCharCreateData.h + sofCharCreateData.h ucs.h wguild_mgr.h WorldConfig.h diff --git a/world/EQLConfig.cpp b/world/EQLConfig.cpp index 6c5ddaf39..c89c90428 100644 --- a/world/EQLConfig.cpp +++ b/world/EQLConfig.cpp @@ -20,7 +20,7 @@ #include "worlddb.h" #include "LauncherLink.h" #include "LauncherList.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include #include diff --git a/world/EQW.cpp b/world/EQW.cpp index 070383dc3..8ff7ac298 100644 --- a/world/EQW.cpp +++ b/world/EQW.cpp @@ -25,7 +25,7 @@ #include "../common/races.h" #include "../common/classes.h" #include "../common/misc.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "zoneserver.h" #include "zonelist.h" #include "clientlist.h" diff --git a/world/EQWHTTPHandler.h b/world/EQWHTTPHandler.h index ab88a6e0b..0545adb42 100644 --- a/world/EQWHTTPHandler.h +++ b/world/EQWHTTPHandler.h @@ -18,8 +18,8 @@ #ifndef EQWHTTPHandler_H #define EQWHTTPHandler_H -#include "../common/TCPServer.h" -#include "../common/TCPConnection.h" +#include "../common/tcp_server.h" +#include "../common/tcp_connection.h" #include "../common/SocketLib/HttpdSocket.h" #include "../common/SocketLib/Mime.h" #include "../common/types.h" diff --git a/world/LauncherLink.cpp b/world/LauncherLink.cpp index de0f20384..3b2463880 100644 --- a/world/LauncherLink.cpp +++ b/world/LauncherLink.cpp @@ -25,7 +25,7 @@ #include "../common/packet_dump.h" #include "../common/servertalk.h" #include "../common/emu_tcp_connection.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "worlddb.h" #include "EQLConfig.h" diff --git a/world/LoginServer.cpp b/world/LoginServer.cpp index 992f1d50a..3b4781a2a 100644 --- a/world/LoginServer.cpp +++ b/world/LoginServer.cpp @@ -56,7 +56,7 @@ #include "LoginServerList.h" #include "../common/eq_packet_structs.h" #include "../common/packet_dump.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "zoneserver.h" #include "worlddb.h" #include "zonelist.h" diff --git a/world/client.cpp b/world/client.cpp index fd45567c6..150d6a9c9 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -1,19 +1,19 @@ #include "../common/debug.h" -#include "../common/EQPacket.h" -#include "../common/EQStreamIntf.h" +#include "../common/eq_packet.h" +#include "../common/eq_stream_intf.h" #include "../common/misc.h" #include "../common/rulesys.h" #include "../common/emu_opcodes.h" #include "../common/eq_packet_structs.h" #include "../common/packet_dump.h" -#include "../common/EQStreamIntf.h" -#include "../common/Item.h" +#include "../common/eq_stream_intf.h" +#include "../common/item.h" #include "../common/races.h" #include "../common/classes.h" #include "../common/languages.h" #include "../common/skills.h" #include "../common/extprofile.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/clientversions.h" #include "client.h" @@ -25,7 +25,7 @@ #include "zonelist.h" #include "clientlist.h" #include "wguild_mgr.h" -#include "SoFCharCreateData.h" +#include "sofCharCreateData.h" #include #include diff --git a/world/client.h b/world/client.h index 8d17864ec..bdf1afbec 100644 --- a/world/client.h +++ b/world/client.h @@ -20,7 +20,7 @@ #include -//#include "../common/EQStream.h" +//#include "../common/eq_stream.h" #include "../common/linked_list.h" #include "../common/timer.h" //#include "zoneserver.h" diff --git a/world/cliententry.cpp b/world/cliententry.cpp index a125b706f..131fceb3d 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -24,7 +24,7 @@ #include "zoneserver.h" #include "WorldConfig.h" #include "../common/guilds.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" extern uint32 numplayers; extern LoginServerList loginserverlist; diff --git a/world/clientlist.cpp b/world/clientlist.cpp index acb582d22..6de17d176 100644 --- a/world/clientlist.cpp +++ b/world/clientlist.cpp @@ -22,7 +22,7 @@ #include "client.h" #include "console.h" #include "worlddb.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/guilds.h" #include "../common/races.h" #include "../common/classes.h" diff --git a/world/console.cpp b/world/console.cpp index 2cd4dac80..e46a880e8 100644 --- a/world/console.cpp +++ b/world/console.cpp @@ -30,7 +30,7 @@ #include "../common/packet_dump.h" #include "../common/seperator.h" #include "../common/eq_packet_structs.h" -#include "../common/EQPacket.h" +#include "../common/eq_packet.h" #include "LoginServer.h" #include "LoginServerList.h" #include "../common/serverinfo.h" @@ -38,7 +38,7 @@ #include "../common/opcodemgr.h" #include "../common/rulesys.h" #include "../common/ruletypes.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "WorldConfig.h" #include "zoneserver.h" #include "zonelist.h" diff --git a/world/lfplist.cpp b/world/lfplist.cpp index 3e2e7611c..52474dfda 100644 --- a/world/lfplist.cpp +++ b/world/lfplist.cpp @@ -22,7 +22,7 @@ #include "zoneserver.h" #include "zonelist.h" #include "../common/logsys.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" extern ClientList client_list; extern ZSList zoneserver_list; diff --git a/world/net.cpp b/world/net.cpp index 663205286..885d27c7d 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -27,22 +27,21 @@ #include "../common/debug.h" #include "../common/queue.h" #include "../common/timer.h" -#include "../common/EQStreamFactory.h" -#include "../common/EQPacket.h" -#include "client.h" -#include "worlddb.h" +#include "../common/eq_stream_factory.h" +#include "../common/eq_packet.h" #include "../common/seperator.h" #include "../common/version.h" #include "../common/eqtime.h" #include "../common/timeoutmgr.h" -#include "../common/EQEMuError.h" +#include "../common/eqemu_error.h" #include "../common/opcodemgr.h" #include "../common/guilds.h" -#include "../common/EQStreamIdent.h" -//#include "../common/patches/Client62.h" +#include "../common/eq_stream_ident.h" #include "../common/rulesys.h" #include "../common/platform.h" #include "../common/crash.h" +#include "client.h" +#include "worlddb.h" #ifdef _WINDOWS #include #define snprintf _snprintf diff --git a/world/world_logsys.cpp b/world/world_logsys.cpp index d7f798b6c..351af9767 100644 --- a/world/world_logsys.cpp +++ b/world/world_logsys.cpp @@ -1,7 +1,7 @@ #include "../common/debug.h" #include "../common/logsys.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "zoneserver.h" #include "client.h" diff --git a/world/worlddb.cpp b/world/worlddb.cpp index ab8f6099a..e6c3492e9 100644 --- a/world/worlddb.cpp +++ b/world/worlddb.cpp @@ -17,16 +17,16 @@ */ #include "worlddb.h" -//#include "../common/Item.h" -#include "../common/StringUtil.h" +//#include "../common/item.h" +#include "../common/string_util.h" #include "../common/eq_packet_structs.h" -#include "../common/Item.h" +#include "../common/item.h" #include "../common/dbasync.h" #include "../common/rulesys.h" #include #include #include -#include "SoFCharCreateData.h" +#include "sofCharCreateData.h" WorldDatabase database; extern std::vector character_create_allocations; diff --git a/world/worlddb.h b/world/worlddb.h index 0dcb6ef44..24f43d308 100644 --- a/world/worlddb.h +++ b/world/worlddb.h @@ -19,7 +19,7 @@ #define WORLDDB_H_ #include "../common/shareddb.h" -#include "../common/ZoneNumbers.h" +#include "../common/zone_numbers.h" struct PlayerProfile_Struct; struct CharCreate_Struct; diff --git a/world/zonelist.cpp b/world/zonelist.cpp index db4843926..6b82c0fe9 100644 --- a/world/zonelist.cpp +++ b/world/zonelist.cpp @@ -23,7 +23,7 @@ #include "console.h" #include "WorldConfig.h" #include "../common/servertalk.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" extern uint32 numzones; extern bool holdzones; diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index 9c40ce516..6f8833bd1 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -29,7 +29,7 @@ #include "../common/guilds.h" #include "../common/packet_dump.h" #include "../common/misc.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "cliententry.h" #include "wguild_mgr.h" #include "lfplist.h" diff --git a/zone/AA.cpp b/zone/AA.cpp index de3704fcd..3c3375fd9 100644 --- a/zone/AA.cpp +++ b/zone/AA.cpp @@ -34,7 +34,7 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) #include "../common/classes.h" #include "../common/eq_packet_structs.h" #include "../common/packet_dump.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/logsys.h" #include "zonedb.h" #include "StringIDs.h" diff --git a/zone/MobAI.cpp b/zone/MobAI.cpp index 021d6f76b..d367c417e 100644 --- a/zone/MobAI.cpp +++ b/zone/MobAI.cpp @@ -27,8 +27,8 @@ #include "map.h" #include "../common/moremath.h" #include "StringIDs.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "../common/features.h" #include "QuestParserCollection.h" diff --git a/zone/Object.cpp b/zone/Object.cpp index ea746c090..666f5da1f 100644 --- a/zone/Object.cpp +++ b/zone/Object.cpp @@ -24,8 +24,8 @@ #include "zonedb.h" #include "../common/packet_functions.h" #include "../common/packet_dump.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/features.h" #include "StringIDs.h" diff --git a/zone/QGlobals.cpp b/zone/QGlobals.cpp index d21bebf2d..85165820b 100644 --- a/zone/QGlobals.cpp +++ b/zone/QGlobals.cpp @@ -1,5 +1,5 @@ #include "../common/debug.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "QGlobals.h" #include "masterentity.h" #include "zone.h" diff --git a/zone/QuestParserCollection.cpp b/zone/QuestParserCollection.cpp index 834cf1528..513334ff1 100644 --- a/zone/QuestParserCollection.cpp +++ b/zone/QuestParserCollection.cpp @@ -17,7 +17,7 @@ */ #include "../common/debug.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "../common/features.h" #include "QuestParserCollection.h" #include "QuestInterface.h" diff --git a/zone/QuestParserCollection.h b/zone/QuestParserCollection.h index f9da8c79c..ff8eb967e 100644 --- a/zone/QuestParserCollection.h +++ b/zone/QuestParserCollection.h @@ -20,7 +20,7 @@ #define _EQE_QUESTPARSERCOLLECTION_H #include "../common/types.h" -#include "../common/Item.h" +#include "../common/item.h" #include "masterentity.h" #include "QuestInterface.h" diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 3c6c306ac..bb8e1c390 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -23,7 +23,7 @@ #include "map.h" #include "../common/spdat.h" #include "../common/skills.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "../common/rulesys.h" #include "StringIDs.h" #include diff --git a/zone/attack.cpp b/zone/attack.cpp index 234149eff..c8d29efac 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -37,7 +37,7 @@ #include "../common/spdat.h" #include "zone.h" #include "StringIDs.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "QuestParserCollection.h" #include "water_map.h" diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index 8ccc8d64e..a57648ac6 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -20,7 +20,7 @@ #include "masterentity.h" #include "../common/packet_dump.h" #include "../common/moremath.h" -#include "../common/Item.h" +#include "../common/item.h" #include "worldserver.h" #include "../common/skills.h" #include "../common/bodytypes.h" diff --git a/zone/bot.cpp b/zone/bot.cpp index aa5ab33f0..a2aa4504b 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -4,7 +4,7 @@ #include "object.h" #include "doors.h" #include "QuestParserCollection.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" extern volatile bool ZoneLoaded; diff --git a/zone/bot.h b/zone/bot.h index eba10a54e..3799b5f0b 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -11,7 +11,7 @@ #include "corpse.h" #include "zonedb.h" #include "StringIDs.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "../common/debug.h" #include "guild_mgr.h" #include "worldserver.h" diff --git a/zone/botspellsai.cpp b/zone/botspellsai.cpp index 14f243d19..4917ed953 100644 --- a/zone/botspellsai.cpp +++ b/zone/botspellsai.cpp @@ -1,7 +1,7 @@ #ifdef BOTS #include "bot.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { diff --git a/zone/client.cpp b/zone/client.cpp index 2f2b4d370..617eceddf 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -49,12 +49,12 @@ extern volatile bool RunLoops; #include "../common/packet_functions.h" #include "petitions.h" #include "../common/serverinfo.h" -#include "../common/ZoneNumbers.h" +#include "../common/zone_numbers.h" #include "../common/moremath.h" #include "../common/guilds.h" #include "../common/breakdowns.h" #include "../common/rulesys.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "forage.h" #include "command.h" #include "StringIDs.h" diff --git a/zone/client.h b/zone/client.h index 718efbb6e..5bd910ce9 100644 --- a/zone/client.h +++ b/zone/client.h @@ -24,15 +24,15 @@ class Client; #include "../common/emu_opcodes.h" #include "../common/eq_packet_structs.h" #include "../common/eq_constants.h" -#include "../common/EQStreamIntf.h" -#include "../common/EQPacket.h" +#include "../common/eq_stream_intf.h" +#include "../common/eq_packet.h" #include "../common/linked_list.h" #include "../common/extprofile.h" #include "../common/classes.h" #include "../common/races.h" #include "../common/deity.h" #include "../common/seperator.h" -#include "../common/Item.h" +#include "../common/item.h" #include "../common/guilds.h" #include "../common/item_struct.h" #include "../common/clientversions.h" diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp index 66eeb9d11..08c652c75 100644 --- a/zone/client_mods.cpp +++ b/zone/client_mods.cpp @@ -22,7 +22,7 @@ #include "../common/packet_dump.h" #include "../common/packet_functions.h" #include "../common/serverinfo.h" -#include "../common/ZoneNumbers.h" +#include "../common/zone_numbers.h" #include "../common/moremath.h" #include "../common/guilds.h" #include "../common/logsys.h" diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index ff8b9e717..8a1c39934 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -45,7 +45,7 @@ #include "worldserver.h" #include "../common/rdtsc.h" #include "../common/packet_dump_file.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/breakdowns.h" #include "../common/guilds.h" #include "../common/rulesys.h" @@ -67,7 +67,7 @@ #include "pathing.h" #include "water_map.h" #include "merc.h" -#include "../common/ZoneNumbers.h" +#include "../common/zone_numbers.h" #include "QuestParserCollection.h" extern Zone* zone; diff --git a/zone/client_process.cpp b/zone/client_process.cpp index acdf67be8..be8b23622 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -47,7 +47,7 @@ #include "../common/packet_dump.h" #include "worldserver.h" #include "../common/packet_dump_file.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/spdat.h" #include "petitions.h" #include "NpcAI.h" diff --git a/zone/command.cpp b/zone/command.cpp index 11f60bfd1..c50956d39 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -47,10 +47,10 @@ #include "../common/packet_dump.h" #include "../common/serverinfo.h" #include "../common/opcodemgr.h" -#include "../common/EQPacket.h" +#include "../common/eq_packet.h" #include "../common/guilds.h" #include "../common/rulesys.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" //#include "../common/servertalk.h" // for oocmute and revoke #include "worldserver.h" #include "masterentity.h" diff --git a/zone/command.h b/zone/command.h index 087e1204c..6a880625e 100644 --- a/zone/command.h +++ b/zone/command.h @@ -21,7 +21,7 @@ #define COMMAND_H #include "../common/seperator.h" -#include "../common/EQStream.h" +#include "../common/eq_stream.h" #include "client.h" #define COMMAND_CHAR '#' diff --git a/zone/corpse.cpp b/zone/corpse.cpp index d4e1a5693..8d0f1d5e1 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -35,7 +35,7 @@ Child of the Mob class. #include "masterentity.h" #include "../common/packet_functions.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/crc32.h" #include "StringIDs.h" #include "worldserver.h" diff --git a/zone/doors.cpp b/zone/doors.cpp index a453191a1..a2b774038 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -25,7 +25,7 @@ #include "zonedb.h" #include "../common/packet_functions.h" #include "../common/packet_dump.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "guild_mgr.h" #define OPEN_DOOR 0x02 diff --git a/zone/effects.cpp b/zone/effects.cpp index 1b1eeb2ea..1b87de0fe 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -24,7 +24,7 @@ #include "../common/packet_functions.h" #include "petitions.h" #include "../common/serverinfo.h" -#include "../common/ZoneNumbers.h" +#include "../common/zone_numbers.h" #include "../common/moremath.h" #include "../common/guilds.h" #include "StringIDs.h" diff --git a/zone/embparser.cpp b/zone/embparser.cpp index c869104f8..1e38597ae 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -20,8 +20,8 @@ #include "../common/debug.h" #include "../common/seperator.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/features.h" #include "masterentity.h" #include "embparser.h" diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index 91b6d1836..b2c4b02ad 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -22,7 +22,7 @@ #ifdef EMBPERL_XS #include "../common/debug.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "embparser.h" #include "questmgr.h" #include "embxs.h" diff --git a/zone/exp.cpp b/zone/exp.cpp index 75d95bf25..95f786e55 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -19,7 +19,7 @@ #include "../common/features.h" #include "masterentity.h" #include "StringIDs.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "QuestParserCollection.h" diff --git a/zone/fearpath.cpp b/zone/fearpath.cpp index 10c66b730..636422b3f 100644 --- a/zone/fearpath.cpp +++ b/zone/fearpath.cpp @@ -23,7 +23,7 @@ #include #include "../common/rulesys.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "map.h" #include "zone.h" #include "pathing.h" diff --git a/zone/forage.cpp b/zone/forage.cpp index 19e52d96d..ba4542575 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -31,8 +31,8 @@ #include "water_map.h" #include "titles.h" #include "StringIDs.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "zonedb.h" diff --git a/zone/groups.cpp b/zone/groups.cpp index d948eb476..5075ee82a 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -20,7 +20,7 @@ #include "NpcAI.h" #include "../common/packet_functions.h" #include "../common/packet_dump.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "worldserver.h" extern EntityList entity_list; extern WorldServer worldserver; diff --git a/zone/guild.cpp b/zone/guild.cpp index 21e350cdf..b803636f1 100644 --- a/zone/guild.cpp +++ b/zone/guild.cpp @@ -25,10 +25,10 @@ #include "../common/packet_functions.h" #include "petitions.h" #include "../common/serverinfo.h" -#include "../common/ZoneNumbers.h" +#include "../common/zone_numbers.h" #include "../common/moremath.h" #include "../common/guilds.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "guild_mgr.h" #include "StringIDs.h" #include "NpcAI.h" diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp index f6f57fe51..087878ffc 100644 --- a/zone/guild_mgr.cpp +++ b/zone/guild_mgr.cpp @@ -20,7 +20,7 @@ #include "zonedb.h" #include "worldserver.h" #include "../common/servertalk.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "client.h" #include "entity.h" diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp index 2d7bd3ea6..5d9cde5c1 100644 --- a/zone/hate_list.cpp +++ b/zone/hate_list.cpp @@ -23,7 +23,7 @@ #include #include "masterentity.h" #include "../common/rulesys.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "hate_list.h" #include "QuestParserCollection.h" #include "zone.h" diff --git a/zone/horse.cpp b/zone/horse.cpp index 04c826df0..02d08b1bb 100644 --- a/zone/horse.cpp +++ b/zone/horse.cpp @@ -18,9 +18,9 @@ #include "../common/debug.h" #include "masterentity.h" -#include "../common/Item.h" +#include "../common/item.h" #include "../common/linked_list.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include #include #include "worldserver.h" diff --git a/zone/inventory.cpp b/zone/inventory.cpp index c626fad43..e013b32e0 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -25,11 +25,11 @@ #include "../common/packet_functions.h" #include "petitions.h" #include "../common/serverinfo.h" -#include "../common/ZoneNumbers.h" +#include "../common/zone_numbers.h" #include "../common/moremath.h" #include "../common/guilds.h" #include "../common/logsys.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "StringIDs.h" #include "NpcAI.h" #include "QuestParserCollection.h" diff --git a/zone/loottables.cpp b/zone/loottables.cpp index 41de7c6eb..b2ebec5ff 100644 --- a/zone/loottables.cpp +++ b/zone/loottables.cpp @@ -22,7 +22,7 @@ #include "npc.h" #include "masterentity.h" #include "zonedb.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #ifdef _WINDOWS #define snprintf _snprintf #endif diff --git a/zone/lua_parser_events.cpp b/zone/lua_parser_events.cpp index 8064106dc..472962b59 100644 --- a/zone/lua_parser_events.cpp +++ b/zone/lua_parser_events.cpp @@ -10,7 +10,7 @@ #include "masterentity.h" #include "../common/seperator.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "lua_item.h" #include "lua_iteminst.h" #include "lua_entity.h" diff --git a/zone/map.cpp b/zone/map.cpp index 42c295e0d..25e57340f 100644 --- a/zone/map.cpp +++ b/zone/map.cpp @@ -1,5 +1,5 @@ #include "../common/debug.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "map.h" #include "RaycastMesh.h" #include "zone.h" diff --git a/zone/merc.cpp b/zone/merc.cpp index ff4581489..aabf3c6b7 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -8,8 +8,8 @@ #include "../common/spdat.h" #include "zone.h" #include "StringIDs.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "QuestParserCollection.h" #include "water_map.h" diff --git a/zone/mob.cpp b/zone/mob.cpp index a6baabd1a..07f7b43b1 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -21,7 +21,7 @@ #include "StringIDs.h" #include "worldserver.h" #include "QuestParserCollection.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include #include diff --git a/zone/net.cpp b/zone/net.cpp index 15e108e42..968de9490 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -22,20 +22,20 @@ #include "../common/features.h" #include "../common/queue.h" #include "../common/timer.h" -#include "../common/EQStream.h" -#include "../common/EQStreamFactory.h" +#include "../common/eq_stream.h" +#include "../common/eq_stream_factory.h" #include "../common/eq_packet_structs.h" #include "../common/Mutex.h" #include "../common/version.h" -#include "../common/EQEMuError.h" +#include "../common/eqemu_error.h" #include "../common/packet_dump_file.h" #include "../common/opcodemgr.h" #include "../common/guilds.h" -#include "../common/EQStreamIdent.h" +#include "../common/eq_stream_ident.h" #include "../common/patches/patches.h" #include "../common/rulesys.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/platform.h" #include "../common/crash.h" #include "../common/ipc_mutex.h" diff --git a/zone/npc.cpp b/zone/npc.cpp index f4e307bbc..32d33d75b 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -40,8 +40,8 @@ #include "../common/spdat.h" #include "../common/bodytypes.h" #include "spawngroup.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "StringIDs.h" diff --git a/zone/object.h b/zone/object.h index 1f0955c1f..226b02ec5 100644 --- a/zone/object.h +++ b/zone/object.h @@ -25,7 +25,7 @@ #include "../common/linked_list.h" #include "../common/emu_opcodes.h" #include "../common/eq_packet_structs.h" -#include "../common/Item.h" +#include "../common/item.h" #include "client.h" #include "mob.h" #include "npc.h" diff --git a/zone/oldcode.cpp b/zone/oldcode.cpp index 031e2492f..7abc79b5c 100644 --- a/zone/oldcode.cpp +++ b/zone/oldcode.cpp @@ -67,12 +67,12 @@ extern volatile bool ZoneLoaded; #include "../common/queue.h" #include "../common/timer.h" -#include "../common/EQStream.h" +#include "../common/eq_stream.h" #include "../common/eq_packet_structs.h" #include "../common/Mutex.h" #include "../common/version.h" #include "../common/files.h" -#include "../common/EQEMuError.h" +#include "../common/eqemu_error.h" #include "../common/packet_dump_file.h" #include "masterentity.h" diff --git a/zone/pathing.cpp b/zone/pathing.cpp index 54e1f06a6..c860913fe 100644 --- a/zone/pathing.cpp +++ b/zone/pathing.cpp @@ -7,7 +7,7 @@ #include #include "pathing.h" #include "water_map.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "doors.h" #include "client.h" #include "zone.h" diff --git a/zone/perl_questitem.cpp b/zone/perl_questitem.cpp index f9128718b..7738b12fb 100644 --- a/zone/perl_questitem.cpp +++ b/zone/perl_questitem.cpp @@ -26,7 +26,7 @@ #undef seed #endif -#include "../common/Item.h" +#include "../common/item.h" #ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS diff --git a/zone/perlpacket.cpp b/zone/perlpacket.cpp index 262c2a278..1475ff448 100644 --- a/zone/perlpacket.cpp +++ b/zone/perlpacket.cpp @@ -22,7 +22,7 @@ #include "entity.h" #include "../common/opcodemgr.h" #include "../common/packet_dump.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" PerlPacket::PerlPacket(const char *opcode, uint32 length) { SetOpcode(opcode); diff --git a/zone/petitions.cpp b/zone/petitions.cpp index 040a1dfcf..e7a210a6e 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -32,7 +32,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/packet_functions.h" #include "../common/packet_dump.h" #include "../common/packet_dump_file.h" diff --git a/zone/petitions.h b/zone/petitions.h index 76db9b006..732b54250 100644 --- a/zone/petitions.h +++ b/zone/petitions.h @@ -23,7 +23,7 @@ #include "zonedb.h" #include "client.h" #include "../common/Mutex.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" class Petition { diff --git a/zone/pets.cpp b/zone/pets.cpp index c7b4b1eac..f2876e0b0 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -20,13 +20,13 @@ #include "masterentity.h" #include "../common/packet_dump.h" #include "../common/moremath.h" -#include "../common/Item.h" +#include "../common/item.h" #include "zonedb.h" #include "worldserver.h" #include "../common/skills.h" #include "../common/bodytypes.h" #include "../common/classes.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "pets.h" #include #include diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 3d3dfd225..fd5c3a376 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -67,7 +67,7 @@ And then at then end of embparser.cpp, add: #include "zonedb.h" #include "../common/spdat.h" #include "../common/packet_functions.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "spawn2.h" #include "zone.h" #include "event_codes.h" diff --git a/zone/raids.cpp b/zone/raids.cpp index c712fc4bd..06630afee 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -20,7 +20,7 @@ #include "NpcAI.h" #include "../common/packet_functions.h" #include "../common/packet_dump.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "worldserver.h" extern EntityList entity_list; extern WorldServer worldserver; diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index 8d2d47fc0..dd541e0a2 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/StringUtil.h" +#include "../common/string_util.h" #include #include "spawn2.h" #include "entity.h" diff --git a/zone/spawngroup.cpp b/zone/spawngroup.cpp index 0044b06eb..04e37cd59 100644 --- a/zone/spawngroup.cpp +++ b/zone/spawngroup.cpp @@ -23,8 +23,8 @@ #include #include "../common/types.h" #include "zonedb.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" extern EntityList entity_list; diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index bd6708a88..691cc98b3 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -24,7 +24,7 @@ #include "masterentity.h" #include "StringIDs.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "../common/rulesys.h" diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 2092aeb2f..3856f66da 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -20,7 +20,7 @@ #include "masterentity.h" #include "../common/packet_dump.h" #include "../common/moremath.h" -#include "../common/Item.h" +#include "../common/item.h" #include "worldserver.h" #include "../common/skills.h" #include "../common/bodytypes.h" diff --git a/zone/spells.cpp b/zone/spells.cpp index 5d891629e..96980b986 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -71,13 +71,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #include "masterentity.h" #include "../common/packet_dump.h" #include "../common/moremath.h" -#include "../common/Item.h" +#include "../common/item.h" #include "worldserver.h" #include "../common/skills.h" #include "../common/bodytypes.h" #include "../common/classes.h" #include "../common/rulesys.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include #include diff --git a/zone/tasks.cpp b/zone/tasks.cpp index ddcabb3f4..c73cdd0fd 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -27,8 +27,8 @@ Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) #define strcasecmp _stricmp #endif -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "masterentity.h" #include "../common/features.h" diff --git a/zone/titles.cpp b/zone/titles.cpp index f51937dba..802d33935 100644 --- a/zone/titles.cpp +++ b/zone/titles.cpp @@ -19,7 +19,7 @@ #include "../common/eq_packet_structs.h" #include "masterentity.h" #include "titles.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "worldserver.h" extern WorldServer worldserver; diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index d89692dbb..dc5a4a1e3 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -30,8 +30,8 @@ #include "../common/packet_dump.h" #include "titles.h" #include "StringIDs.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "QuestParserCollection.h" diff --git a/zone/trading.cpp b/zone/trading.cpp index 9a504d2cb..d8f17cd9b 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -18,7 +18,7 @@ #include "../common/debug.h" #include "masterentity.h" #include "StringIDs.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "QuestParserCollection.h" #include "worldserver.h" diff --git a/zone/trap.cpp b/zone/trap.cpp index 2ab431c24..badd14c6c 100644 --- a/zone/trap.cpp +++ b/zone/trap.cpp @@ -20,8 +20,8 @@ #include "entity.h" #include "masterentity.h" #include "../common/spdat.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" /* diff --git a/zone/tribute.cpp b/zone/tribute.cpp index 63166cc41..c70afc992 100644 --- a/zone/tribute.cpp +++ b/zone/tribute.cpp @@ -20,7 +20,7 @@ #include "../common/features.h" #include "masterentity.h" #include "../common/packet_dump.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include #include diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index eb22f13a8..1f30b7ff3 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -29,8 +29,8 @@ #include "water_map.h" #include "../common/moremath.h" #include "StringIDs.h" -#include "../common/MiscFunctions.h" -#include "../common/StringUtil.h" +#include "../common/misc_functions.h" +#include "../common/string_util.h" #include "../common/rulesys.h" #include "../common/features.h" #include "QuestParserCollection.h" diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index edadc94f3..4c3e53189 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -36,7 +36,7 @@ #include "worldserver.h" #include "../common/eq_packet_structs.h" #include "../common/packet_dump.h" -#include "../common/MiscFunctions.h" +#include "../common/misc_functions.h" #include "zonedb.h" #include "zone.h" #include "entity.h" diff --git a/zone/zone.cpp b/zone/zone.cpp index d0d8efb2f..7252d843e 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -43,9 +43,9 @@ #include "net.h" #include "../common/seperator.h" #include "../common/packet_dump_file.h" -#include "../common/EQStreamFactory.h" -#include "../common/EQStream.h" -#include "../common/StringUtil.h" +#include "../common/eq_stream_factory.h" +#include "../common/eq_stream.h" +#include "../common/string_util.h" #include "ZoneConfig.h" #include "../common/breakdowns.h" #include "map.h" diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 0d1653453..92bf3cc22 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -1,7 +1,7 @@ #include "zonedb.h" -#include "../common/Item.h" -#include "../common/StringUtil.h" +#include "../common/item.h" +#include "../common/string_util.h" #include "../common/extprofile.h" #include "../common/guilds.h" #include "../common/rulesys.h" diff --git a/zone/zonedbasync.cpp b/zone/zonedbasync.cpp index 4d1bf8491..579517d55 100644 --- a/zone/zonedbasync.cpp +++ b/zone/zonedbasync.cpp @@ -2,7 +2,7 @@ #include #include "entity.h" #include "masterentity.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "../common/breakdowns.h" #include diff --git a/zone/zonedump.h b/zone/zonedump.h index 052f7446d..0d2bcb1d2 100644 --- a/zone/zonedump.h +++ b/zone/zonedump.h @@ -28,7 +28,7 @@ spawn2 mediumblob, npcs mediumblob, npc_loot mediumblob, gmspawntype mediumblob, #define ZONEDUMP_H #include "../common/faction.h" #include "../common/eq_packet_structs.h" -#include "../common/Item.h" +#include "../common/item.h" #pragma pack(1) diff --git a/zone/zoning.cpp b/zone/zoning.cpp index f69598ce5..35041a4c1 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -22,7 +22,7 @@ #include "masterentity.h" #include "../common/packet_dump.h" #include "../common/rulesys.h" -#include "../common/StringUtil.h" +#include "../common/string_util.h" #include "StringIDs.h" #include "QuestParserCollection.h"