From c9762b0e385243ec383672e5785b1f45b16bb93b Mon Sep 17 00:00:00 2001 From: Spp Date: Thu, 26 Jan 2012 10:54:53 +0100 Subject: [PATCH] Core: Change Handlers location --- src/server/game/CMakeLists.txt | 4 +++- .../game/{Server/Protocol => }/Handlers/AddonHandler.cpp | 0 src/server/game/{Server/Protocol => }/Handlers/AddonHandler.h | 0 .../game/{Server/Protocol => }/Handlers/ArenaTeamHandler.cpp | 0 .../{Server/Protocol => }/Handlers/AuctionHouseHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/AuthHandler.cpp | 0 .../{Server/Protocol => }/Handlers/BattleGroundHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/CalendarHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/ChannelHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/CharacterHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/ChatHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/CombatHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/DuelHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/GroupHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/GuildHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/ItemHandler.cpp | 0 src/server/game/{Server/Protocol => }/Handlers/LFGHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/LootHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/MailHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/MiscHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/MovementHandler.cpp | 0 src/server/game/{Server/Protocol => }/Handlers/NPCHandler.cpp | 0 src/server/game/{Server/Protocol => }/Handlers/NPCHandler.h | 0 src/server/game/{Server/Protocol => }/Handlers/PetHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/PetitionsHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/QueryHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/QuestHandler.cpp | 0 .../{Server/Protocol => }/Handlers/ReferAFriendHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/SkillHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/SpellHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/TaxiHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/TicketHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/TradeHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/VehicleHandler.cpp | 0 .../game/{Server/Protocol => }/Handlers/VoiceChatHandler.cpp | 0 src/server/scripts/CMakeLists.txt | 2 +- src/server/worldserver/CMakeLists.txt | 2 +- 37 files changed, 5 insertions(+), 3 deletions(-) rename src/server/game/{Server/Protocol => }/Handlers/AddonHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/AddonHandler.h (100%) rename src/server/game/{Server/Protocol => }/Handlers/ArenaTeamHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/AuctionHouseHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/AuthHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/BattleGroundHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/CalendarHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/ChannelHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/CharacterHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/ChatHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/CombatHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/DuelHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/GroupHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/GuildHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/ItemHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/LFGHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/LootHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/MailHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/MiscHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/MovementHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/NPCHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/NPCHandler.h (100%) rename src/server/game/{Server/Protocol => }/Handlers/PetHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/PetitionsHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/QueryHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/QuestHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/ReferAFriendHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/SkillHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/SpellHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/TaxiHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/TicketHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/TradeHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/VehicleHandler.cpp (100%) rename src/server/game/{Server/Protocol => }/Handlers/VoiceChatHandler.cpp (100%) diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 658e9a15cc..e97b896155 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -30,6 +30,7 @@ file(GLOB_RECURSE sources_Globals Globals/*.cpp Globals/*.h) file(GLOB_RECURSE sources_Grids Grids/*.cpp Grids/*.h) file(GLOB_RECURSE sources_Groups Groups/*.cpp Groups/*.h) file(GLOB_RECURSE sources_Guilds Guilds/*.cpp Guilds/*.h) +file(GLOB_RECURSE sources_Handlers Handlers/*.cpp Server/*.h) file(GLOB_RECURSE sources_Instances Instances/*.cpp Instances/*.h) file(GLOB_RECURSE sources_Loot Loot/*.cpp Loot/*.h) file(GLOB_RECURSE sources_Mails Mails/*.cpp Mails/*.h) @@ -79,6 +80,7 @@ set(game_STAT_SRCS ${sources_Grids} ${sources_Groups} ${sources_Guilds} + ${sources_Handlers} ${sources_Instances} ${sources_Loot} ${sources_Mails} @@ -165,6 +167,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Grids ${CMAKE_CURRENT_SOURCE_DIR}/Groups ${CMAKE_CURRENT_SOURCE_DIR}/Guilds + ${CMAKE_CURRENT_SOURCE_DIR}/Handlers ${CMAKE_CURRENT_SOURCE_DIR}/Instances ${CMAKE_CURRENT_SOURCE_DIR}/Loot ${CMAKE_CURRENT_SOURCE_DIR}/Mails @@ -181,7 +184,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Reputation ${CMAKE_CURRENT_SOURCE_DIR}/Scripting ${CMAKE_CURRENT_SOURCE_DIR}/Server/Protocol - ${CMAKE_CURRENT_SOURCE_DIR}/Server/Protocol/Handlers ${CMAKE_CURRENT_SOURCE_DIR}/Server ${CMAKE_CURRENT_SOURCE_DIR}/Skills ${CMAKE_CURRENT_SOURCE_DIR}/Spells diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp b/src/server/game/Handlers/AddonHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/AddonHandler.cpp rename to src/server/game/Handlers/AddonHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.h b/src/server/game/Handlers/AddonHandler.h similarity index 100% rename from src/server/game/Server/Protocol/Handlers/AddonHandler.h rename to src/server/game/Handlers/AddonHandler.h diff --git a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp rename to src/server/game/Handlers/ArenaTeamHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp rename to src/server/game/Handlers/AuctionHouseHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/AuthHandler.cpp b/src/server/game/Handlers/AuthHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/AuthHandler.cpp rename to src/server/game/Handlers/AuthHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp rename to src/server/game/Handlers/BattleGroundHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/CalendarHandler.cpp rename to src/server/game/Handlers/CalendarHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp rename to src/server/game/Handlers/ChannelHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp rename to src/server/game/Handlers/CharacterHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/ChatHandler.cpp rename to src/server/game/Handlers/ChatHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/CombatHandler.cpp rename to src/server/game/Handlers/CombatHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/DuelHandler.cpp rename to src/server/game/Handlers/DuelHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/GroupHandler.cpp rename to src/server/game/Handlers/GroupHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/GuildHandler.cpp rename to src/server/game/Handlers/GuildHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/ItemHandler.cpp rename to src/server/game/Handlers/ItemHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/LFGHandler.cpp rename to src/server/game/Handlers/LFGHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/LootHandler.cpp rename to src/server/game/Handlers/LootHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/MailHandler.cpp rename to src/server/game/Handlers/MailHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/MiscHandler.cpp rename to src/server/game/Handlers/MiscHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/MovementHandler.cpp rename to src/server/game/Handlers/MovementHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/NPCHandler.cpp rename to src/server/game/Handlers/NPCHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/NPCHandler.h b/src/server/game/Handlers/NPCHandler.h similarity index 100% rename from src/server/game/Server/Protocol/Handlers/NPCHandler.h rename to src/server/game/Handlers/NPCHandler.h diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/PetHandler.cpp rename to src/server/game/Handlers/PetHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp rename to src/server/game/Handlers/PetitionsHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/QueryHandler.cpp rename to src/server/game/Handlers/QueryHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/QuestHandler.cpp rename to src/server/game/Handlers/QuestHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/ReferAFriendHandler.cpp b/src/server/game/Handlers/ReferAFriendHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/ReferAFriendHandler.cpp rename to src/server/game/Handlers/ReferAFriendHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/SkillHandler.cpp rename to src/server/game/Handlers/SkillHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/SpellHandler.cpp rename to src/server/game/Handlers/SpellHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp rename to src/server/game/Handlers/TaxiHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/TicketHandler.cpp rename to src/server/game/Handlers/TicketHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/TradeHandler.cpp rename to src/server/game/Handlers/TradeHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp rename to src/server/game/Handlers/VehicleHandler.cpp diff --git a/src/server/game/Server/Protocol/Handlers/VoiceChatHandler.cpp b/src/server/game/Handlers/VoiceChatHandler.cpp similarity index 100% rename from src/server/game/Server/Protocol/Handlers/VoiceChatHandler.cpp rename to src/server/game/Handlers/VoiceChatHandler.cpp diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index d34b1b8c3c..d43cce45c0 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -112,6 +112,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers ${CMAKE_SOURCE_DIR}/src/server/game/Groups ${CMAKE_SOURCE_DIR}/src/server/game/Guilds + ${CMAKE_SOURCE_DIR}/src/server/game/Handlers ${CMAKE_SOURCE_DIR}/src/server/game/Instances ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup ${CMAKE_SOURCE_DIR}/src/server/game/Loot @@ -130,7 +131,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Scripting ${CMAKE_SOURCE_DIR}/src/server/game/Server ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol - ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol/Handlers ${CMAKE_SOURCE_DIR}/src/server/game/Skills ${CMAKE_SOURCE_DIR}/src/server/game/Spells ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 60adce4132..e2b70c9c67 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -108,6 +108,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Grids ${CMAKE_SOURCE_DIR}/src/server/game/Groups ${CMAKE_SOURCE_DIR}/src/server/game/Guilds + ${CMAKE_SOURCE_DIR}/src/server/game/Handlers ${CMAKE_SOURCE_DIR}/src/server/game/Instances ${CMAKE_SOURCE_DIR}/src/server/game/Loot ${CMAKE_SOURCE_DIR}/src/server/game/Mails @@ -123,7 +124,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Reputation ${CMAKE_SOURCE_DIR}/src/server/game/Scripting ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol - ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol/Handlers ${CMAKE_SOURCE_DIR}/src/server/game/Server ${CMAKE_SOURCE_DIR}/src/server/game/Skills ${CMAKE_SOURCE_DIR}/src/server/game/Spells