From 07a2cbe9a55de1d1ad7a80cc5b073d24a6d253ad Mon Sep 17 00:00:00 2001 From: KimLS Date: Thu, 21 Aug 2014 23:46:01 -0700 Subject: [PATCH] Renamed zone files --- zone/CMakeLists.txt | 36 +++++------ zone/{AA.cpp => aa.cpp} | 10 +-- zone/{AA.h => aa.h} | 2 +- zone/aggro.cpp | 2 +- zone/attack.cpp | 6 +- zone/bonuses.cpp | 4 +- zone/bot.cpp | 2 +- zone/bot.h | 4 +- zone/{botStructs.h => bot_structs.h} | 0 zone/client.cpp | 6 +- zone/client.h | 4 +- zone/client_mods.cpp | 4 +- zone/client_packet.cpp | 10 +-- zone/client_process.cpp | 6 +- zone/command.cpp | 6 +- zone/corpse.cpp | 4 +- zone/doors.cpp | 2 +- zone/effects.cpp | 4 +- zone/embparser.cpp | 2 +- zone/embparser.h | 4 +- zone/entity.cpp | 4 +- zone/entity.h | 2 +- zone/exp.cpp | 4 +- zone/forage.cpp | 4 +- zone/groups.cpp | 2 +- zone/guild.cpp | 4 +- zone/hate_list.cpp | 2 +- zone/inventory.cpp | 6 +- zone/lua_general.cpp | 4 +- zone/lua_parser.h | 4 +- zone/lua_parser_events.cpp | 4 +- zone/map.cpp | 2 +- zone/merc.cpp | 6 +- zone/mob.cpp | 4 +- zone/{MobAI.cpp => mob_ai.cpp} | 6 +- zone/mod_functions.cpp | 2 +- zone/mod_functions_base.cpp | 2 +- zone/net.cpp | 6 +- zone/npc.cpp | 4 +- zone/npc.h | 2 +- zone/{NpcAI.cpp => npc_ai.cpp} | 0 zone/{NpcAI.h => npc_ai.h} | 0 zone/{Object.cpp => object.cpp} | 4 +- ...layerCorpse.cpp => perl_player_corpse.cpp} | 0 zone/pets.cpp | 2 +- zone/{QGlobals.cpp => qglobals.cpp} | 2 +- zone/{QGlobals.h => qglobals.h} | 0 zone/{Quest.cpp => quest.cpp} | 2 +- zone/{Quest.h => quest.h} | 0 zone/{QuestInterface.h => quest_interface.h} | 0 ...ection.cpp => quest_parser_collection.cpp} | 4 +- ...Collection.h => quest_parser_collection.h} | 2 +- zone/questmgr.cpp | 4 +- zone/raids.cpp | 2 +- zone/{RaycastMesh.cpp => raycast_mesh.cpp} | 2 +- zone/{RaycastMesh.h => raycast_mesh.h} | 0 zone/special_attacks.cpp | 2 +- zone/spell_effects.cpp | 4 +- zone/spells.cpp | 4 +- zone/{StringIDs.h => string_ids.h} | 0 zone/tasks.cpp | 2 +- zone/tradeskills.cpp | 62 +++++++++---------- zone/trading.cpp | 4 +- zone/waypoints.cpp | 6 +- zone/worldserver.cpp | 6 +- zone/zone.cpp | 4 +- zone/zone.h | 2 +- zone/{ZoneConfig.cpp => zone_config.cpp} | 2 +- zone/{ZoneConfig.h => zone_config.h} | 0 zone/zoning.cpp | 4 +- 70 files changed, 159 insertions(+), 159 deletions(-) rename zone/{AA.cpp => aa.cpp} (99%) rename zone/{AA.h => aa.h} (99%) rename zone/{botStructs.h => bot_structs.h} (100%) rename zone/{MobAI.cpp => mob_ai.cpp} (99%) rename zone/{NpcAI.cpp => npc_ai.cpp} (100%) rename zone/{NpcAI.h => npc_ai.h} (100%) rename zone/{Object.cpp => object.cpp} (99%) rename zone/{perl_PlayerCorpse.cpp => perl_player_corpse.cpp} (100%) rename zone/{QGlobals.cpp => qglobals.cpp} (99%) rename zone/{QGlobals.h => qglobals.h} (100%) rename zone/{Quest.cpp => quest.cpp} (99%) rename zone/{Quest.h => quest.h} (100%) rename zone/{QuestInterface.h => quest_interface.h} (100%) rename zone/{QuestParserCollection.cpp => quest_parser_collection.cpp} (99%) rename zone/{QuestParserCollection.h => quest_parser_collection.h} (99%) rename zone/{RaycastMesh.cpp => raycast_mesh.cpp} (99%) rename zone/{RaycastMesh.h => raycast_mesh.h} (100%) rename zone/{StringIDs.h => string_ids.h} (100%) rename zone/{ZoneConfig.cpp => zone_config.cpp} (97%) rename zone/{ZoneConfig.h => zone_config.h} (100%) diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt index 9f7250d4e..8459fb79a 100644 --- a/zone/CMakeLists.txt +++ b/zone/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(zone_sources - AA.cpp + aa.cpp aggro.cpp attack.cpp beacon.cpp @@ -69,12 +69,12 @@ SET(zone_sources map.cpp merc.cpp mob.cpp - MobAI.cpp + mob_ai.cpp mod_functions.cpp net.cpp npc.cpp - NpcAI.cpp - Object.cpp + npc_ai.cpp + object.cpp oriented_bounding_box.cpp pathing.cpp perl_client.cpp @@ -86,17 +86,17 @@ SET(zone_sources perl_npc.cpp perl_object.cpp perl_perlpacket.cpp - perl_PlayerCorpse.cpp + perl_player_corpse.cpp perl_questitem.cpp perl_raids.cpp perlpacket.cpp petitions.cpp pets.cpp - QGlobals.cpp + qglobals.cpp questmgr.cpp - QuestParserCollection.cpp + quest_parser_collection.cpp raids.cpp - RaycastMesh.cpp + raycast_mesh.cpp spawn2.cpp spawn2.h spawngroup.cpp @@ -116,18 +116,18 @@ SET(zone_sources worldserver.cpp zone.cpp zone_logsys.cpp - ZoneConfig.cpp + zone_config.cpp zonedb.cpp zonedbasync.cpp zoning.cpp ) SET(zone_headers - AA.h + aa.h basic_functions.h beacon.h bot.h - botStructs.h + bot_structs.h client.h client_logs.h client_packet.h @@ -175,25 +175,25 @@ SET(zone_headers mob.h net.h npc.h - NpcAI.h + npc_ai.h object.h oriented_bounding_box.h pathing.h perlpacket.h petitions.h pets.h - QGlobals.h - QuestInterface.h + qglobals.h + quest_interface.h questmgr.h - QuestParserCollection.h + quest_parser_collection.h raid.h raids.h - RaycastMesh.h + raycast_mesh.h skills.h spawn2.cpp spawn2.h spawngroup.h - StringIDs.h + string_ids.h tasks.h titles.h trap.h @@ -202,7 +202,7 @@ SET(zone_headers water_map_v2.h worldserver.h zone.h - ZoneConfig.h + zone_config.h zonedb.h zonedbasync.h zonedump.h diff --git a/zone/AA.cpp b/zone/aa.cpp similarity index 99% rename from zone/AA.cpp rename to zone/aa.cpp index 3c3375fd9..735776b79 100644 --- a/zone/AA.cpp +++ b/zone/aa.cpp @@ -19,7 +19,7 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) // Test 1 #include "../common/debug.h" -#include "AA.h" +#include "aa.h" #include "mob.h" #include "client.h" #include "groups.h" @@ -37,7 +37,7 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) #include "../common/string_util.h" #include "../common/logsys.h" #include "zonedb.h" -#include "StringIDs.h" +#include "string_ids.h" //static data arrays, really not big enough to warrant shared mem. AA_DBAction AA_Actions[aaHighestID][MAX_AA_ACTION_RANKS]; //[aaid][rank] @@ -458,7 +458,7 @@ void Client::HandleAAAction(aaID activate) { Escape(); break; - // Don't think this code is used any longer for Bestial Alignment as the AA has a spell_id and no nonspell_action. + // Don't think this code is used any longer for Bestial Alignment as the aa.has a spell_id and no nonspell_action. case aaActionBeastialAlignment: switch(GetBaseRace()) { case BARBARIAN: @@ -1237,7 +1237,7 @@ void Client::SendAA(uint32 id, int seq) { Note: There were many ways to achieve this effect - The method used proved to be the most straight forward and consistent. Stacking does not currently work ideally for AA's that use hotkeys, therefore they will be excluded at this time. - TODO: Problem with AA hotkeys - When you reach max rank of an AA tier (ie 5/5), it automatically displays the next AA in + TODO: Problem with aa.hotkeys - When you reach max rank of an AA tier (ie 5/5), it automatically displays the next AA in the series and you can not transfer the hotkey to the next AA series. To the best of the my ability and through many different variations of coding I could not find an ideal solution to this issue. @@ -1676,7 +1676,7 @@ bool ZoneDatabase::LoadAAEffects() { return true; } -//Returns the number effects an AA has when we send them to the client +//Returns the number effects an aa.has when we send them to the client //For the purposes of sizing a packet because every skill does not //have the same number effects, they can range from none to a few depending on AA. //counts the # of effects by counting the different slots of an AAID in the DB. diff --git a/zone/AA.h b/zone/aa.h similarity index 99% rename from zone/AA.h rename to zone/aa.h index 3adc887e3..b143aae9a 100644 --- a/zone/AA.h +++ b/zone/aa.h @@ -2134,7 +2134,7 @@ struct AALevelCost_Struct uint32 Cost; }; -//assumes that no activatable AA has more than 5 ranks +//assumes that no activatable aa.has more than 5 ranks #define MAX_AA_ACTION_RANKS 20 extern AA_DBAction AA_Actions[aaHighestID][MAX_AA_ACTION_RANKS]; //[aaid][rank] extern std::map AA_SwarmPets; //key=spell_id diff --git a/zone/aggro.cpp b/zone/aggro.cpp index bb8e1c390..d55dab4fd 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -25,7 +25,7 @@ #include "../common/skills.h" #include "../common/misc_functions.h" #include "../common/rulesys.h" -#include "StringIDs.h" +#include "string_ids.h" #include extern Zone* zone; diff --git a/zone/attack.cpp b/zone/attack.cpp index c8d29efac..dd14b1770 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -29,17 +29,17 @@ #include #include "masterentity.h" -#include "NpcAI.h" +#include "npc_ai.h" #include "../common/packet_dump.h" #include "../common/eq_packet_structs.h" #include "../common/eq_constants.h" #include "../common/skills.h" #include "../common/spdat.h" #include "zone.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/string_util.h" #include "../common/rulesys.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "water_map.h" #include "worldserver.h" extern WorldServer worldserver; diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index a57648ac6..f1105ce73 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -26,7 +26,7 @@ #include "../common/bodytypes.h" #include "../common/classes.h" #include "../common/rulesys.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include #include #include @@ -35,7 +35,7 @@ #include "../common/unix.h" #endif -#include "StringIDs.h" +#include "string_ids.h" void Mob::CalcBonuses() { diff --git a/zone/bot.cpp b/zone/bot.cpp index a2aa4504b..e782e6db8 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -3,7 +3,7 @@ #include "bot.h" #include "object.h" #include "doors.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "../common/string_util.h" extern volatile bool ZoneLoaded; diff --git a/zone/bot.h b/zone/bot.h index 3799b5f0b..9c1ec9cb2 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -3,14 +3,14 @@ #ifdef BOTS -#include "botStructs.h" +#include "bot_structs.h" #include "mob.h" #include "client.h" #include "pets.h" #include "groups.h" #include "corpse.h" #include "zonedb.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/misc_functions.h" #include "../common/debug.h" #include "guild_mgr.h" diff --git a/zone/botStructs.h b/zone/bot_structs.h similarity index 100% rename from zone/botStructs.h rename to zone/bot_structs.h diff --git a/zone/client.cpp b/zone/client.cpp index 617eceddf..d986dbe22 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -57,11 +57,11 @@ extern volatile bool RunLoops; #include "../common/string_util.h" #include "forage.h" #include "command.h" -#include "StringIDs.h" -#include "NpcAI.h" +#include "string_ids.h" +#include "npc_ai.h" #include "client_logs.h" #include "guild_mgr.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" extern EntityList entity_list; diff --git a/zone/client.h b/zone/client.h index 5bd910ce9..b78530ae1 100644 --- a/zone/client.h +++ b/zone/client.h @@ -43,9 +43,9 @@ class Client; #include "npc.h" #include "merc.h" #include "zone.h" -#include "AA.h" +#include "aa.h" #include "questmgr.h" -#include "QGlobals.h" +#include "qglobals.h" #ifdef _WINDOWS // since windows defines these within windef.h (which windows.h include) diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp index 08c652c75..ba8eae47e 100644 --- a/zone/client_mods.cpp +++ b/zone/client_mods.cpp @@ -30,8 +30,8 @@ #include "worldserver.h" #include "zonedb.h" #include "petitions.h" -#include "StringIDs.h" -#include "NpcAI.h" +#include "string_ids.h" +#include "npc_ai.h" // Return max stat value for level diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 8a1c39934..ce6b1a323 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -51,24 +51,24 @@ #include "../common/rulesys.h" #include "../common/spdat.h" #include "petitions.h" -#include "NpcAI.h" +#include "npc_ai.h" #include "../common/skills.h" #include "forage.h" #include "zone.h" #include "event_codes.h" #include "../common/faction.h" #include "../common/crc32.h" -#include "StringIDs.h" +#include "string_ids.h" #include "map.h" #include "titles.h" #include "pets.h" -#include "ZoneConfig.h" +#include "zone_config.h" #include "guild_mgr.h" #include "pathing.h" #include "water_map.h" #include "merc.h" #include "../common/zone_numbers.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" extern Zone* zone; extern volatile bool ZoneLoaded; @@ -8970,7 +8970,7 @@ bool Client::FinishConnState2(DBAsyncWork* dbaw) { continue; } - if(aa[a]->value > 1) //hack in some stuff for sony's new AA method (where each level of each AA has a seperate ID) + if(aa[a]->value > 1) //hack in some stuff for sony's new AA method (where each level of each aa.has a seperate ID) aa_points[(id - aa[a]->value +1)] = aa[a]->value; else aa_points[id] = aa[a]->value; diff --git a/zone/client_process.cpp b/zone/client_process.cpp index be8b23622..3fea686ab 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -50,7 +50,7 @@ #include "../common/string_util.h" #include "../common/spdat.h" #include "petitions.h" -#include "NpcAI.h" +#include "npc_ai.h" #include "../common/skills.h" #include "forage.h" #include "zone.h" @@ -58,11 +58,11 @@ #include "../common/faction.h" #include "../common/crc32.h" #include "../common/rulesys.h" -#include "StringIDs.h" +#include "string_ids.h" #include "map.h" #include "guild_mgr.h" #include -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" extern Zone* zone; extern volatile bool ZoneLoaded; diff --git a/zone/command.cpp b/zone/command.cpp index c50956d39..555804cfa 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -68,11 +68,11 @@ extern WorldServer worldserver; extern TaskManager *taskmanager; void CatchSignal(int sig_num); -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" -#include "StringIDs.h" +#include "string_ids.h" #include "command.h" -#include "QGlobals.h" +#include "qglobals.h" //struct cl_struct *commandlist; // the actual linked list of commands int commandcount; // how many commands we have diff --git a/zone/corpse.cpp b/zone/corpse.cpp index 8d0f1d5e1..aa7841a64 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -37,10 +37,10 @@ Child of the Mob class. #include "../common/packet_functions.h" #include "../common/string_util.h" #include "../common/crc32.h" -#include "StringIDs.h" +#include "string_ids.h" #include "worldserver.h" #include "../common/rulesys.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" extern EntityList entity_list; extern Zone* zone; diff --git a/zone/doors.cpp b/zone/doors.cpp index a2b774038..c353ce568 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -21,7 +21,7 @@ #include #include "masterentity.h" #include "worldserver.h" -#include "StringIDs.h" +#include "string_ids.h" #include "zonedb.h" #include "../common/packet_functions.h" #include "../common/packet_dump.h" diff --git a/zone/effects.cpp b/zone/effects.cpp index 1b87de0fe..a24a6b39b 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -27,8 +27,8 @@ #include "../common/zone_numbers.h" #include "../common/moremath.h" #include "../common/guilds.h" -#include "StringIDs.h" -#include "NpcAI.h" +#include "string_ids.h" +#include "npc_ai.h" float Client::GetActSpellRange(uint16 spell_id, float range, bool IsBard) { diff --git a/zone/embparser.cpp b/zone/embparser.cpp index 1e38597ae..8c4a82f55 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -26,7 +26,7 @@ #include "masterentity.h" #include "embparser.h" #include "questmgr.h" -#include "QGlobals.h" +#include "qglobals.h" #include "zone.h" #include #include diff --git a/zone/embparser.h b/zone/embparser.h index ffca78075..3cb3a57f7 100644 --- a/zone/embparser.h +++ b/zone/embparser.h @@ -20,8 +20,8 @@ #define EQMEU_EMBPARSER_H #ifdef EMBPERL -#include "QuestParserCollection.h" -#include "QuestInterface.h" +#include "quest_parser_collection.h" +#include "quest_interface.h" #include #include #include diff --git a/zone/entity.cpp b/zone/entity.cpp index d904dbdfe..469bf8111 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -39,11 +39,11 @@ #include "petitions.h" #include "../common/spdat.h" #include "../common/features.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/dbasync.h" #include "guild_mgr.h" #include "raids.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #ifdef _WINDOWS #define snprintf _snprintf diff --git a/zone/entity.h b/zone/entity.h index c1ba0936c..d61298b0a 100644 --- a/zone/entity.h +++ b/zone/entity.h @@ -29,7 +29,7 @@ #include "zonedb.h" #include "zonedump.h" #include "zonedbasync.h" -#include "QGlobals.h" +#include "qglobals.h" class EQApplicationPacket; diff --git a/zone/exp.cpp b/zone/exp.cpp index 95f786e55..73d339af6 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -18,10 +18,10 @@ #include "../common/debug.h" #include "../common/features.h" #include "masterentity.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/string_util.h" #include "../common/rulesys.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" static uint32 MaxBankedGroupLeadershipPoints(int Level) diff --git a/zone/forage.cpp b/zone/forage.cpp index ba4542575..aaa3451d5 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -30,7 +30,7 @@ #include "npc.h" #include "water_map.h" #include "titles.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/misc_functions.h" #include "../common/string_util.h" #include "../common/rulesys.h" @@ -40,7 +40,7 @@ #define snprintf _snprintf #endif -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" //max number of items which can be in the foraging table //for a given zone. diff --git a/zone/groups.cpp b/zone/groups.cpp index 5075ee82a..598fa4989 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -17,7 +17,7 @@ */ #include "../common/debug.h" #include "masterentity.h" -#include "NpcAI.h" +#include "npc_ai.h" #include "../common/packet_functions.h" #include "../common/packet_dump.h" #include "../common/string_util.h" diff --git a/zone/guild.cpp b/zone/guild.cpp index b803636f1..92635c185 100644 --- a/zone/guild.cpp +++ b/zone/guild.cpp @@ -30,8 +30,8 @@ #include "../common/guilds.h" #include "../common/string_util.h" #include "guild_mgr.h" -#include "StringIDs.h" -#include "NpcAI.h" +#include "string_ids.h" +#include "npc_ai.h" extern WorldServer worldserver; diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp index 5d9cde5c1..c7f44e6ba 100644 --- a/zone/hate_list.cpp +++ b/zone/hate_list.cpp @@ -25,7 +25,7 @@ #include "../common/rulesys.h" #include "../common/misc_functions.h" #include "hate_list.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "zone.h" #include "water_map.h" diff --git a/zone/inventory.cpp b/zone/inventory.cpp index e013b32e0..5c5f80122 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -30,9 +30,9 @@ #include "../common/guilds.h" #include "../common/logsys.h" #include "../common/string_util.h" -#include "StringIDs.h" -#include "NpcAI.h" -#include "QuestParserCollection.h" +#include "string_ids.h" +#include "npc_ai.h" +#include "quest_parser_collection.h" extern WorldServer worldserver; // @merth: this needs to be touched up diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index 508112f4a..878f82225 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -13,9 +13,9 @@ #include "lua_client.h" #include "lua_npc.h" #include "lua_entity_list.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "questmgr.h" -#include "QGlobals.h" +#include "qglobals.h" #include "../common/timer.h" struct Events { }; diff --git a/zone/lua_parser.h b/zone/lua_parser.h index b30e3d3b7..732f7d235 100644 --- a/zone/lua_parser.h +++ b/zone/lua_parser.h @@ -2,8 +2,8 @@ #define _EQE_LUA_PARSER_H #ifdef LUA_EQEMU -#include "QuestParserCollection.h" -#include "QuestInterface.h" +#include "quest_parser_collection.h" +#include "quest_interface.h" #include #include #include diff --git a/zone/lua_parser_events.cpp b/zone/lua_parser_events.cpp index 472962b59..56e5d236d 100644 --- a/zone/lua_parser_events.cpp +++ b/zone/lua_parser_events.cpp @@ -5,8 +5,8 @@ #include #include -#include "QuestParserCollection.h" -#include "QuestInterface.h" +#include "quest_parser_collection.h" +#include "quest_interface.h" #include "masterentity.h" #include "../common/seperator.h" diff --git a/zone/map.cpp b/zone/map.cpp index 25e57340f..a023cc125 100644 --- a/zone/map.cpp +++ b/zone/map.cpp @@ -1,7 +1,7 @@ #include "../common/debug.h" #include "../common/misc_functions.h" #include "map.h" -#include "RaycastMesh.h" +#include "raycast_mesh.h" #include "zone.h" #include #include diff --git a/zone/merc.cpp b/zone/merc.cpp index aabf3c6b7..cb9a166ab 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -1,17 +1,17 @@ #include "merc.h" #include "masterentity.h" -#include "NpcAI.h" +#include "npc_ai.h" #include "../common/packet_dump.h" #include "../common/eq_packet_structs.h" #include "../common/eq_constants.h" #include "../common/skills.h" #include "../common/spdat.h" #include "zone.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/misc_functions.h" #include "../common/string_util.h" #include "../common/rulesys.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "water_map.h" extern volatile bool ZoneLoaded; diff --git a/zone/mob.cpp b/zone/mob.cpp index 07f7b43b1..6297d4ee8 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -18,9 +18,9 @@ #include "../common/debug.h" #include "masterentity.h" #include "../common/spdat.h" -#include "StringIDs.h" +#include "string_ids.h" #include "worldserver.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "../common/string_util.h" #include diff --git a/zone/MobAI.cpp b/zone/mob_ai.cpp similarity index 99% rename from zone/MobAI.cpp rename to zone/mob_ai.cpp index d367c417e..d6a336a7c 100644 --- a/zone/MobAI.cpp +++ b/zone/mob_ai.cpp @@ -23,15 +23,15 @@ #include #include "npc.h" #include "masterentity.h" -#include "NpcAI.h" +#include "npc_ai.h" #include "map.h" #include "../common/moremath.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/misc_functions.h" #include "../common/string_util.h" #include "../common/rulesys.h" #include "../common/features.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "water_map.h" extern EntityList entity_list; diff --git a/zone/mod_functions.cpp b/zone/mod_functions.cpp index 0a9a66537..b948dff38 100644 --- a/zone/mod_functions.cpp +++ b/zone/mod_functions.cpp @@ -12,7 +12,7 @@ #include "mob.h" #include "client.h" #include "worldserver.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "event_codes.h" #include "embparser.h" #include diff --git a/zone/mod_functions_base.cpp b/zone/mod_functions_base.cpp index 8beb6cd79..e9e172997 100644 --- a/zone/mod_functions_base.cpp +++ b/zone/mod_functions_base.cpp @@ -12,7 +12,7 @@ #include "mob.h" #include "client.h" #include "worldserver.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "event_codes.h" #include "embparser.h" #include diff --git a/zone/net.cpp b/zone/net.cpp index 6fba81d49..d81ea71e3 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -43,18 +43,18 @@ #include "../common/eqemu_exception.h" #include "../common/spdat.h" -#include "ZoneConfig.h" +#include "zone_config.h" #include "masterentity.h" #include "worldserver.h" #include "net.h" #include "zone.h" #include "command.h" -#include "ZoneConfig.h" +#include "zone_config.h" #include "titles.h" #include "guild_mgr.h" #include "tasks.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "embparser.h" #include "lua_parser.h" #include "client_logs.h" diff --git a/zone/npc.cpp b/zone/npc.cpp index 32d33d75b..f70c1e847 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -43,7 +43,7 @@ #include "../common/misc_functions.h" #include "../common/string_util.h" #include "../common/rulesys.h" -#include "StringIDs.h" +#include "string_ids.h" //#define SPELLQUEUE //Use only if you want to be spammed by spell testing @@ -52,7 +52,7 @@ extern Zone* zone; extern volatile bool ZoneLoaded; extern EntityList entity_list; -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float heading, int iflymode, bool IsCorpse) : Mob(d->name, diff --git a/zone/npc.h b/zone/npc.h index 34fcfcd0a..5b28260d4 100644 --- a/zone/npc.h +++ b/zone/npc.h @@ -29,7 +29,7 @@ class NPC; #include "spawn2.h" #include "../common/loottable.h" #include "zonedump.h" -#include "QGlobals.h" +#include "qglobals.h" #include "../common/rulesys.h" #ifdef _WINDOWS diff --git a/zone/NpcAI.cpp b/zone/npc_ai.cpp similarity index 100% rename from zone/NpcAI.cpp rename to zone/npc_ai.cpp diff --git a/zone/NpcAI.h b/zone/npc_ai.h similarity index 100% rename from zone/NpcAI.h rename to zone/npc_ai.h diff --git a/zone/Object.cpp b/zone/object.cpp similarity index 99% rename from zone/Object.cpp rename to zone/object.cpp index 666f5da1f..a2c418b40 100644 --- a/zone/Object.cpp +++ b/zone/object.cpp @@ -27,9 +27,9 @@ #include "../common/misc_functions.h" #include "../common/string_util.h" #include "../common/features.h" -#include "StringIDs.h" +#include "string_ids.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" const char DEFAULT_OBJECT_NAME[] = "IT63_ACTORDEF"; const char DEFAULT_OBJECT_NAME_SUFFIX[] = "_ACTORDEF"; diff --git a/zone/perl_PlayerCorpse.cpp b/zone/perl_player_corpse.cpp similarity index 100% rename from zone/perl_PlayerCorpse.cpp rename to zone/perl_player_corpse.cpp diff --git a/zone/pets.cpp b/zone/pets.cpp index f2876e0b0..40d064521 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -35,7 +35,7 @@ #include "../common/unix.h" #endif -#include "StringIDs.h" +#include "string_ids.h" /////////////////////////////////////////////////////////////////////////////// // pet related functions diff --git a/zone/QGlobals.cpp b/zone/qglobals.cpp similarity index 99% rename from zone/QGlobals.cpp rename to zone/qglobals.cpp index 85165820b..53f64670b 100644 --- a/zone/QGlobals.cpp +++ b/zone/qglobals.cpp @@ -1,6 +1,6 @@ #include "../common/debug.h" #include "../common/string_util.h" -#include "QGlobals.h" +#include "qglobals.h" #include "masterentity.h" #include "zone.h" #include "zonedb.h" diff --git a/zone/QGlobals.h b/zone/qglobals.h similarity index 100% rename from zone/QGlobals.h rename to zone/qglobals.h diff --git a/zone/Quest.cpp b/zone/quest.cpp similarity index 99% rename from zone/Quest.cpp rename to zone/quest.cpp index 9a98902ab..fb2d9f851 100644 --- a/zone/Quest.cpp +++ b/zone/quest.cpp @@ -29,7 +29,7 @@ #include "../common/unix.h" #endif -#include "Quest.h" +#include "quest.h" pquest_entry Quest::m_pQuests; int Quest::m_nQuests; diff --git a/zone/Quest.h b/zone/quest.h similarity index 100% rename from zone/Quest.h rename to zone/quest.h diff --git a/zone/QuestInterface.h b/zone/quest_interface.h similarity index 100% rename from zone/QuestInterface.h rename to zone/quest_interface.h diff --git a/zone/QuestParserCollection.cpp b/zone/quest_parser_collection.cpp similarity index 99% rename from zone/QuestParserCollection.cpp rename to zone/quest_parser_collection.cpp index 513334ff1..376c121d3 100644 --- a/zone/QuestParserCollection.cpp +++ b/zone/quest_parser_collection.cpp @@ -19,8 +19,8 @@ #include "../common/debug.h" #include "../common/misc_functions.h" #include "../common/features.h" -#include "QuestParserCollection.h" -#include "QuestInterface.h" +#include "quest_parser_collection.h" +#include "quest_interface.h" #include "zone.h" #include "questmgr.h" diff --git a/zone/QuestParserCollection.h b/zone/quest_parser_collection.h similarity index 99% rename from zone/QuestParserCollection.h rename to zone/quest_parser_collection.h index ff8eb967e..902500231 100644 --- a/zone/QuestParserCollection.h +++ b/zone/quest_parser_collection.h @@ -23,7 +23,7 @@ #include "../common/item.h" #include "masterentity.h" -#include "QuestInterface.h" +#include "quest_interface.h" #include #include diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index fd5c3a376..d8b9094be 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -73,8 +73,8 @@ And then at then end of embparser.cpp, add: #include "event_codes.h" #include "guild_mgr.h" #include "../common/rulesys.h" -#include "QGlobals.h" -#include "QuestParserCollection.h" +#include "qglobals.h" +#include "quest_parser_collection.h" #ifdef BOTS #include "bot.h" diff --git a/zone/raids.cpp b/zone/raids.cpp index 06630afee..84ebcee7d 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -17,7 +17,7 @@ */ #include "../common/debug.h" #include "masterentity.h" -#include "NpcAI.h" +#include "npc_ai.h" #include "../common/packet_functions.h" #include "../common/packet_dump.h" #include "../common/string_util.h" diff --git a/zone/RaycastMesh.cpp b/zone/raycast_mesh.cpp similarity index 99% rename from zone/RaycastMesh.cpp rename to zone/raycast_mesh.cpp index 404961bf0..078f225a1 100644 --- a/zone/RaycastMesh.cpp +++ b/zone/raycast_mesh.cpp @@ -1,4 +1,4 @@ -#include "RaycastMesh.h" +#include "raycast_mesh.h" #include #include #include diff --git a/zone/RaycastMesh.h b/zone/raycast_mesh.h similarity index 100% rename from zone/RaycastMesh.h rename to zone/raycast_mesh.h diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 691cc98b3..6ba7528b6 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -23,7 +23,7 @@ #include #include "masterentity.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/misc_functions.h" #include "../common/rulesys.h" diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 3856f66da..bb1c3c449 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -33,8 +33,8 @@ #include "../common/unix.h" #endif -#include "StringIDs.h" -#include "QuestParserCollection.h" +#include "string_ids.h" +#include "quest_parser_collection.h" extern Zone* zone; extern volatile bool ZoneLoaded; diff --git a/zone/spells.cpp b/zone/spells.cpp index 96980b986..8db861ae1 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -90,8 +90,8 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #include "../common/packet_dump_file.h" #endif -#include "StringIDs.h" -#include "QuestParserCollection.h" +#include "string_ids.h" +#include "quest_parser_collection.h" extern Zone* zone; extern volatile bool ZoneLoaded; diff --git a/zone/StringIDs.h b/zone/string_ids.h similarity index 100% rename from zone/StringIDs.h rename to zone/string_ids.h diff --git a/zone/tasks.cpp b/zone/tasks.cpp index c73cdd0fd..994ebdc5d 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -32,7 +32,7 @@ Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) #include "../common/rulesys.h" #include "masterentity.h" #include "../common/features.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "mob.h" diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index dc5a4a1e3..4d4edb344 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -29,11 +29,11 @@ #include "../common/packet_functions.h" #include "../common/packet_dump.h" #include "titles.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/misc_functions.h" #include "../common/string_util.h" #include "../common/rulesys.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" static const SkillUseTypes TradeskillUnknown = Skill1HBlunt; /* an arbitrary non-tradeskill */ @@ -928,20 +928,20 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { _log(TRADESKILLS__TRACE, "...Bonusstat: %d , INT: %d , WIS: %d , DEX: %d , STR: %d", bonusstat , GetINT() , GetWIS() , GetDEX() , GetSTR()); float res = MakeRandomFloat(0, 99); - int AAChance = 0; + int aa_chance = 0; //AA modifiers //can we do this with nested switches? if(spec->tradeskill == SkillAlchemy){ switch(GetAA(aaAlchemyMastery)){ case 1: - AAChance = 10; + aa_chance = 10; break; case 2: - AAChance = 25; + aa_chance = 25; break; case 3: - AAChance = 50; + aa_chance = 50; break; } } @@ -949,13 +949,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if(spec->tradeskill == SkillJewelryMaking){ switch(GetAA(aaJewelCraftMastery)){ case 1: - AAChance = 10; + aa_chance = 10; break; case 2: - AAChance = 25; + aa_chance = 25; break; case 3: - AAChance = 50; + aa_chance = 50; break; } } @@ -964,13 +964,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if (spec->tradeskill == SkillBlacksmithing) { switch(GetAA(aaBlacksmithingMastery)) { case 1: - AAChance = 10; + aa_chance = 10; break; case 2: - AAChance = 25; + aa_chance = 25; break; case 3: - AAChance = 50; + aa_chance = 50; break; } } @@ -978,13 +978,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if (spec->tradeskill == SkillBaking) { switch(GetAA(aaBakingMastery)) { case 1: - AAChance = 10; + aa_chance = 10; break; case 2: - AAChance = 25; + aa_chance = 25; break; case 3: - AAChance = 50; + aa_chance = 50; break; } } @@ -992,13 +992,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if (spec->tradeskill == SkillBrewing) { switch(GetAA(aaBrewingMastery)) { case 1: - AAChance = 10; + aa_chance = 10; break; case 2: - AAChance = 25; + aa_chance = 25; break; case 3: - AAChance = 50; + aa_chance = 50; break; } } @@ -1006,13 +1006,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if (spec->tradeskill == SkillFletching) { switch(GetAA(aaFletchingMastery2)) { case 1: - AAChance = 10; + aa_chance = 10; break; case 2: - AAChance = 25; + aa_chance = 25; break; case 3: - AAChance = 50; + aa_chance = 50; break; } } @@ -1020,13 +1020,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if (spec->tradeskill == SkillPottery) { switch(GetAA(aaPotteryMastery)) { case 1: - AAChance = 10; + aa_chance = 10; break; case 2: - AAChance = 25; + aa_chance = 25; break; case 3: - AAChance = 50; + aa_chance = 50; break; } } @@ -1034,13 +1034,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if (spec->tradeskill == SkillTailoring) { switch(GetAA(aaTailoringMastery)) { case 1: - AAChance = 10; + aa_chance = 10; break; case 2: - AAChance = 25; + aa_chance = 25; break; case 3: - AAChance = 50; + aa_chance = 50; break; } } @@ -1048,20 +1048,20 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if (spec->tradeskill == SkillResearch) { switch(GetAA(aaArcaneTongues)) { case 1: - AAChance = 10; + aa_chance = 10; break; case 2: - AAChance = 25; + aa_chance = 25; break; case 3: - AAChance = 50; + aa_chance = 50; break; } } chance = mod_tradeskill_chance(chance, spec); - if (((spec->tradeskill==75) || GetGM() || (chance > res)) || MakeRandomInt(0, 99) < AAChance){ + if (((spec->tradeskill==75) || GetGM() || (chance > res)) || MakeRandomInt(0, 99) < aa_chance){ success_modifier = 1; if(over_trivial < 0) diff --git a/zone/trading.cpp b/zone/trading.cpp index d8f17cd9b..1efcbbb33 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -17,10 +17,10 @@ */ #include "../common/debug.h" #include "masterentity.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/string_util.h" #include "../common/rulesys.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #include "worldserver.h" extern WorldServer worldserver; diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index 1f30b7ff3..8c8a3f218 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -24,16 +24,16 @@ #include #include "npc.h" #include "masterentity.h" -#include "NpcAI.h" +#include "npc_ai.h" #include "map.h" #include "water_map.h" #include "../common/moremath.h" -#include "StringIDs.h" +#include "string_ids.h" #include "../common/misc_functions.h" #include "../common/string_util.h" #include "../common/rulesys.h" #include "../common/features.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" struct wp_distance { diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 4c3e53189..791a34ee4 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -45,12 +45,12 @@ #include "petitions.h" #include "../common/packet_functions.h" #include "../common/md5.h" -#include "ZoneConfig.h" -#include "StringIDs.h" +#include "zone_config.h" +#include "string_ids.h" #include "guild_mgr.h" #include "../common/rulesys.h" #include "titles.h" -#include "QGlobals.h" +#include "qglobals.h" extern EntityList entity_list; diff --git a/zone/zone.cpp b/zone/zone.cpp index 7252d843e..6bf3689ce 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -46,7 +46,7 @@ #include "../common/eq_stream_factory.h" #include "../common/eq_stream.h" #include "../common/string_util.h" -#include "ZoneConfig.h" +#include "zone_config.h" #include "../common/breakdowns.h" #include "map.h" #include "water_map.h" @@ -57,7 +57,7 @@ #include "client_logs.h" #include "../common/rulesys.h" #include "guild_mgr.h" -#include "QuestParserCollection.h" +#include "quest_parser_collection.h" #ifdef _WINDOWS #define snprintf _snprintf diff --git a/zone/zone.h b/zone/zone.h index 0256beeec..77132124e 100644 --- a/zone/zone.h +++ b/zone/zone.h @@ -32,7 +32,7 @@ #include "spawn2.h" #include "tasks.h" #include "pathing.h" -#include "QGlobals.h" +#include "qglobals.h" #include class Map; diff --git a/zone/ZoneConfig.cpp b/zone/zone_config.cpp similarity index 97% rename from zone/ZoneConfig.cpp rename to zone/zone_config.cpp index 65ecefa13..3775f1e4b 100644 --- a/zone/ZoneConfig.cpp +++ b/zone/zone_config.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" -#include "ZoneConfig.h" +#include "zone_config.h" ZoneConfig *ZoneConfig::_zone_config = nullptr; diff --git a/zone/ZoneConfig.h b/zone/zone_config.h similarity index 100% rename from zone/ZoneConfig.h rename to zone/zone_config.h diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 35041a4c1..3d638bfb5 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -23,8 +23,8 @@ #include "../common/packet_dump.h" #include "../common/rulesys.h" #include "../common/string_util.h" -#include "StringIDs.h" -#include "QuestParserCollection.h" +#include "string_ids.h" +#include "quest_parser_collection.h" extern WorldServer worldserver; extern Zone* zone;