aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt10
-rw-r--r--src/server/CMakeLists.txt8
-rw-r--r--src/server/authserver/CMakeLists.txt6
-rw-r--r--src/server/framework/CMakeLists.txt2
-rw-r--r--[-rwxr-xr-x]src/server/game/AuctionHouse/AuctionHouseMgr.cpp0
-rw-r--r--src/server/game/CMakeLists.txt709
-rw-r--r--src/server/game/Calendar/Calendar.cpp17
-rw-r--r--src/server/game/Calendar/Calendar.h26
-rw-r--r--src/server/game/Calendar/CalendarHandler.cpp318
-rw-r--r--src/server/scripts/CMakeLists.txt81
-rw-r--r--src/server/shared/Auth/CMakeLists.txt4
-rw-r--r--src/server/shared/CMakeLists.txt4
-rw-r--r--src/server/shared/Config/CMakeLists.txt4
-rw-r--r--src/server/shared/Database/CMakeLists.txt7
-rw-r--r--src/server/shared/Database/Database.cpp2
-rw-r--r--src/server/shared/vmap/CMakeLists.txt2
-rw-r--r--src/server/worldserver/CMakeLists.txt59
-rw-r--r--src/tools/vmap3_assembler/CMakeLists.txt4
18 files changed, 885 insertions, 378 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd174ba8735..b0531d9ab6d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,2 @@
-add_subdirectory(framework)
-add_subdirectory(game)
-if (DO_SCRIPTS)
- add_subdirectory(scripts)
-endif (DO_SCRIPTS)
-add_subdirectory(shared)
-add_subdirectory(trinitycore)
-add_subdirectory(trinityrealm)
+add_subdirectory(server)
+
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
new file mode 100644
index 00000000000..39a96cf1f3c
--- /dev/null
+++ b/src/server/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory(framework)
+add_subdirectory(game)
+if (DO_SCRIPTS)
+ add_subdirectory(scripts)
+endif (DO_SCRIPTS)
+add_subdirectory(shared)
+add_subdirectory(worldserver)
+add_subdirectory(authserver)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 8f3e9b87540..5a993be5377 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -16,9 +16,9 @@ RealmAcceptor.h
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/shared/Database
- ${CMAKE_SOURCE_DIR}/src/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+ ${CMAKE_SOURCE_DIR}/src/server/framework
${MYSQL_INCLUDE_DIR}
)
diff --git a/src/server/framework/CMakeLists.txt b/src/server/framework/CMakeLists.txt
index bcf3603cb5e..76a256f3c5a 100644
--- a/src/server/framework/CMakeLists.txt
+++ b/src/server/framework/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(trinityframework_STAT_SRCS
include_directories(
${ACE_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/src/framework
+ ${CMAKE_SOURCE_DIR}/src/server/framework
)
add_library(trinityframework STATIC ${trinityframework_STAT_SRCS})
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index ddd44bbefa2..ddd44bbefa2 100755..100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 1ec450e9468..44fe870baa4 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -4,346 +4,395 @@ IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
SET(game_STAT_SRCS
- AccountMgr.cpp
- AccountMgr.h
- AddonMgr.cpp
- AddonMgr.h
- AchievementMgr.h
- AchievementMgr.cpp
- AddonHandler.cpp
- AddonHandler.h
- CombatAI.cpp
- CombatAI.h
- ArenaTeam.cpp
- ArenaTeam.h
- ArenaTeamHandler.cpp
- AuctionHouseHandler.cpp
- AuctionHouseBot.cpp
- AuctionHouseBot.h
- AuctionHouseMgr.cpp
- AuctionHouseMgr.h
- Bag.cpp
- Bag.h
- BattleGround.cpp
- BattleGroundAA.cpp
- BattleGroundAB.cpp
- BattleGroundRB.cpp
- BattleGroundAV.cpp
- BattleGroundBE.cpp
- BattleGroundDS.cpp
- BattleGroundEY.cpp
- BattleGroundIC.cpp
- BattleGroundNA.cpp
- BattleGroundRL.cpp
- BattleGroundRV.cpp
- BattleGroundSA.cpp
- BattleGroundWS.cpp
- BattleGround.h
- BattleGroundAA.h
- BattleGroundAB.h
- BattleGroundRB.h
- BattleGroundAV.h
- BattleGroundBE.h
- BattleGroundDS.h
- BattleGroundEY.h
- BattleGroundIC.h
- BattleGroundNA.h
- BattleGroundRL.h
- BattleGroundRV.h
- BattleGroundSA.h
- BattleGroundWS.h
- BattleGroundHandler.cpp
- BattleGroundMgr.cpp
- BattleGroundMgr.h
- Calendar.cpp
- Calendar.h
- CalendarHandler.cpp
- Cell.h
- CellImpl.h
- Channel.cpp
- Channel.h
- ChannelHandler.cpp
- CharacterHandler.cpp
- ChannelMgr.h
- ChannelMgr.cpp
- Chat.cpp
- Chat.h
- ChatHandler.cpp
- CombatHandler.cpp
- ConditionMgr.cpp
- ConditionMgr.h
- ConfusedMovementGenerator.cpp
- ConfusedMovementGenerator.h
- Corpse.cpp
- Corpse.h
- CreatureAI.cpp
- CreatureAI.h
- CreatureAIFactory.h
- CreatureAIImpl.h
- CreatureAIRegistry.cpp
- CreatureAIRegistry.h
- CreatureAISelector.cpp
- CreatureAISelector.h
- CreatureEventAI.cpp
- CreatureEventAIMgr.cpp
- Creature.cpp
- Creature.h
- CreatureGroups.cpp
- CreatureGroups.h
- DBCEnums.h
- DBCStores.cpp
- DBCStores.h
- DBCStructure.h
- DBCfmt.h
- Debugcmds.cpp
- DestinationHolder.cpp
- DestinationHolder.h
- DestinationHolderImp.h
- DuelHandler.cpp
- DynamicObject.cpp
- DynamicObject.h
- FleeingMovementGenerator.cpp
- FleeingMovementGenerator.h
- Formulas.h
- GameEventMgr.cpp
- GameEventMgr.h
- GameObject.cpp
- GameObject.h
- GlobalEvents.cpp
- GlobalEvents.h
- GossipDef.cpp
- GossipDef.h
- GridDefines.h
- GridNotifiers.cpp
- GridNotifiers.h
- GridNotifiersImpl.h
- GridStates.cpp
- GridStates.h
- Group.cpp
- Group.h
- GroupHandler.cpp
- GuardAI.cpp
- GuardAI.h
- Guild.cpp
- Guild.h
- GuildHandler.cpp
- HomeMovementGenerator.cpp
- HomeMovementGenerator.h
- HostileRefManager.cpp
- HostileRefManager.h
- IdleMovementGenerator.cpp
- IdleMovementGenerator.h
- InstanceData.cpp
- InstanceData.h
- InstanceSaveMgr.cpp
- InstanceSaveMgr.h
- Item.cpp
- Item.h
- ItemEnchantmentMgr.cpp
- ItemEnchantmentMgr.h
- ItemHandler.cpp
- ItemPrototype.h
- Language.h
- Level0.cpp
- Level1.cpp
- Level2.cpp
- Level3.cpp
- LFG.h
- LFGHandler.cpp
- LFGMgr.cpp
- LFGMgr.h
- LootHandler.cpp
- LootMgr.cpp
- LootMgr.h
- Mail.cpp
- Mail.h
- Map.cpp
- Map.h
- MapInstanced.cpp
- MapInstanced.h
- MapManager.cpp
- MapManager.h
- MapUpdater.cpp
- MapUpdater.h
- MapReference.h
- MapRefManager.h
- MiscHandler.cpp
- MotionMaster.cpp
- MotionMaster.h
- MovementGenerator.cpp
- MovementGenerator.h
- MovementGeneratorImpl.h
- MovementHandler.cpp
- NPCHandler.cpp
- NPCHandler.h
- PassiveAI.cpp
- PassiveAI.h
- ObjectAccessor.cpp
- ObjectAccessor.h
- Object.cpp
- ObjectDefines.h
- ObjectGridLoader.cpp
- ObjectGridLoader.h
- Object.h
- ObjectMgr.cpp
- ObjectMgr.h
- ObjectPosSelector.cpp
- ObjectPosSelector.h
- Opcodes.cpp
- Opcodes.h
- OutdoorPvP.cpp
- OutdoorPvP.h
- OutdoorPvPEP.cpp
- OutdoorPvPEP.h
- OutdoorPvPHP.cpp
- OutdoorPvPHP.h
- OutdoorPvPMgr.cpp
- OutdoorPvPMgr.h
- OutdoorPvPNA.cpp
- OutdoorPvPNA.h
- OutdoorPvPSI.cpp
- OutdoorPvPSI.h
- OutdoorPvPTF.cpp
- OutdoorPvPTF.h
- OutdoorPvPZM.cpp
- OutdoorPvPZM.h
- Path.h
- PetAI.cpp
- PetAI.h
- Pet.cpp
- Pet.h
- PetHandler.cpp
- PetitionsHandler.cpp
- Player.cpp
- Player.h
- PlayerDump.cpp
- PlayerDump.h
- PointMovementGenerator.cpp
- PointMovementGenerator.h
- PoolHandler.cpp
- PoolHandler.h
- QueryHandler.cpp
- QuestDef.cpp
- QuestDef.h
- QuestHandler.cpp
- RandomMovementGenerator.cpp
- RandomMovementGenerator.h
- ReactorAI.cpp
- ReactorAI.h
- ReputationMgr.cpp
- ReputationMgr.h
- ScriptedSmartAI.cpp
- ScriptedSmartAI.h
- ScriptLoader.cpp
- ScriptLoader.h
- ScriptMgr.cpp
- ScriptMgr.h
- ScriptSystem.cpp
- ScriptSystem.h
- SharedDefines.h
- SkillHandler.cpp
- SpellAuraDefines.h
- SpellAuras.cpp
- SpellAuras.h
- SpellAuraEffects.cpp
- SpellAuraEffects.h
- Spell.cpp
- SpellEffects.cpp
- Spell.h
- SkillDiscovery.cpp
- SkillDiscovery.h
- SkillExtraItems.cpp
- SkillExtraItems.h
- SpellHandler.cpp
- SocialMgr.cpp
- SocialMgr.h
- SpellMgr.cpp
- SpellMgr.h
- StatSystem.cpp
- TargetedMovementGenerator.cpp
- TargetedMovementGenerator.h
- TaxiHandler.cpp
- TemporarySummon.cpp
- TemporarySummon.h
- TicketHandler.cpp
- Tools.cpp
- Tools.h
- TotemAI.cpp
- TotemAI.h
- Totem.cpp
- Totem.h
- TradeHandler.cpp
- Transports.cpp
- Transports.h
- ThreatManager.cpp
- ThreatManager.h
- Traveller.h
- Unit.cpp
- Unit.h
- UnitAI.cpp
- UnitAI.h
- UnitEvents.h
- UpdateData.cpp
- UpdateData.h
- UpdateFields.h
- UpdateMask.h
- Vehicle.cpp
- Vehicle.h
- VoiceChatHandler.cpp
- WaypointManager.cpp
- WaypointManager.h
- WaypointMovementGenerator.cpp
- WaypointMovementGenerator.h
- Weather.cpp
- Weather.h
- World.cpp
- World.h
- WorldLog.cpp
- WorldLog.h
- WorldSession.cpp
- WorldSession.h
- WorldSocket.cpp
- WorldSocket.h
- WorldSocketMgr.cpp
- WorldSocketMgr.h
- FollowerReference.cpp
- FollowerReference.h
- FollowerRefManager.h
- GroupReference.cpp
- GroupReference.h
- GroupRefManager.h
- OutdoorPvPImpl.h
- ZoneScript.h
+ Account/AccountMgr.cpp
+ Account/AccountMgr.h
+ Achievements/AchievementMgr.h
+ Achievements/AchievementMgr.cpp
+ Addons/AddonMgr.cpp
+ Addons/AddonMgr.h
+ Addons/AddonHandler.cpp
+ Addons/AddonHandler.h
+ AI/AuctionHouseBot/AuctionHouseBot.cpp
+ AI/AuctionHouseBot/AuctionHouseBot.h
+ AI/EventAI/CreatureEventAI.cpp
+ AI/EventAI/CreatureEventAIMgr.cpp
+ AI/ScriptedAI/ScriptedSmartAI.cpp
+ AI/ScriptedAI/ScriptedSmartAI.h
+ AI/CombatAI.cpp
+ AI/CombatAI.h
+ AI/CreatureAI.cpp
+ AI/CreatureAI.h
+ AI/CreatureAIFactory.h
+ AI/CreatureAIImpl.h
+ AI/CreatureAIRegistry.cpp
+ AI/CreatureAIRegistry.h
+ AI/CreatureAISelector.cpp
+ AI/CreatureAISelector.h
+ AI/GuardAI.cpp
+ AI/GuardAI.h
+ AI/PassiveAI.cpp
+ AI/PassiveAI.h
+ AI/PetAI.cpp
+ AI/PetAI.h
+ AI/ReactorAI.cpp
+ AI/ReactorAI.h
+ AI/TotemAI.cpp
+ AI/TotemAI.h
+ AI/UnitAI.cpp
+ AI/UnitAI.h
+ AuctionHouse/AuctionHouseHandler.cpp
+ AuctionHouse/AuctionHouseMgr.cpp
+ AuctionHouse/AuctionHouseMgr.h
+ BattleGrounds/ArenaTeam.cpp
+ BattleGrounds/ArenaTeam.h
+ BattleGrounds/ArenaTeamHandler.cpp
+ BattleGrounds/BattleGround.cpp
+ BattleGrounds/BattleGroundAA.cpp
+ BattleGrounds/BattleGroundAB.cpp
+ BattleGrounds/BattleGroundRB.cpp
+ BattleGrounds/BattleGroundAV.cpp
+ BattleGrounds/BattleGroundBE.cpp
+ BattleGrounds/BattleGroundDS.cpp
+ BattleGrounds/BattleGroundEY.cpp
+ BattleGrounds/BattleGroundIC.cpp
+ BattleGrounds/BattleGroundNA.cpp
+ BattleGrounds/BattleGroundRL.cpp
+ BattleGrounds/BattleGroundRV.cpp
+ BattleGrounds/BattleGroundSA.cpp
+ BattleGrounds/BattleGroundWS.cpp
+ BattleGrounds/BattleGround.h
+ BattleGrounds/BattleGroundAA.h
+ BattleGrounds/BattleGroundAB.h
+ BattleGrounds/BattleGroundRB.h
+ BattleGrounds/BattleGroundAV.h
+ BattleGrounds/BattleGroundBE.h
+ BattleGrounds/BattleGroundDS.h
+ BattleGrounds/BattleGroundEY.h
+ BattleGrounds/BattleGroundIC.h
+ BattleGrounds/BattleGroundNA.h
+ BattleGrounds/BattleGroundRL.h
+ BattleGrounds/BattleGroundRV.h
+ BattleGrounds/BattleGroundSA.h
+ BattleGrounds/BattleGroundWS.h
+ BattleGrounds/BattleGroundHandler.cpp
+ BattleGrounds/BattleGroundMgr.cpp
+ BattleGrounds/BattleGroundMgr.h
+ Calendar/Calendar.cpp
+ Calendar/Calendar.h
+ Calendar/CalendarHandler.cpp
+ Chat/Channel.cpp
+ Chat/Channel.h
+ Chat/ChannelHandler.cpp
+ Chat/ChannelMgr.h
+ Chat/ChannelMgr.cpp
+ Chat/Chat.cpp
+ Chat/Chat.h
+ Chat/ChatHandler.cpp
+ Chat/Debugcmds.cpp
+ Chat/Level0.cpp
+ Chat/Level1.cpp
+ Chat/Level2.cpp
+ Chat/Level3.cpp
+ Combat/CombatHandler.cpp
+ Combat/HostileRefManager.cpp
+ Combat/HostileRefManager.h
+ Combat/ThreatManager.cpp
+ Combat/ThreatManager.h
+ ConditionMgr/ConditionMgr.cpp
+ ConditionMgr/ConditionMgr.h
+ DataStores/DBCEnums.h
+ DataStores/DBCStores.cpp
+ DataStores/DBCStores.h
+ DataStores/DBCStructure.h
+ DataStores/DBCfmt.h
+ Entities/Creature/Creature.cpp
+ Entities/Creature/Creature.h
+ Entities/Creature/CreatureGroups.cpp
+ Entities/Creature/CreatureGroups.h
+ Entities/Creature/GossipDef.cpp
+ Entities/Creature/GossipDef.h
+ Entities/Creature/NPCHandler.cpp
+ Entities/Creature/NPCHandler.h
+ Entities/Creature/TemporarySummon.cpp
+ Entities/Creature/TemporarySummon.h
+ Entities/GameObject/GameObject.cpp
+ Entities/GameObject/GameObject.h
+ Entities/Item/Bag.cpp
+ Entities/Item/Bag.h
+ Entities/Item/Item.cpp
+ Entities/Item/Item.h
+ Entities/Item/ItemEnchantmentMgr.cpp
+ Entities/Item/ItemEnchantmentMgr.h
+ Entities/Item/ItemHandler.cpp
+ Entities/Item/ItemPrototype.h
+ Entities/Object/Corpse.cpp
+ Entities/Object/Corpse.h
+ Entities/Object/DynamicObject.cpp
+ Entities/Object/DynamicObject.h
+ Entities/Object/ObjectAccessor.cpp
+ Entities/Object/ObjectAccessor.h
+ Entities/Object/Object.cpp
+ Entities/Object/ObjectDefines.h
+ Entities/Object/Object.h
+ Entities/Object/ObjectMgr.cpp
+ Entities/Object/ObjectMgr.h
+ Entities/Object/UpdateData.cpp
+ Entities/Object/UpdateData.h
+ Entities/Object/UpdateFields.h
+ Entities/Object/UpdateMask.h
+ Entities/Pet/Pet.cpp
+ Entities/Pet/Pet.h
+ Entities/Pet/PetHandler.cpp
+ Entities/Player/DuelHandler.cpp
+ Entities/Player/MiscHandler.cpp
+ Entities/Player/PetitionsHandler.cpp
+ Entities/Player/Player.cpp
+ Entities/Player/Player.h
+ Entities/Player/SocialMgr.cpp
+ Entities/Player/SocialMgr.h
+ Entities/Player/TicketHandler.cpp
+ Entities/Player/TradeHandler.cpp
+ Entities/Player/VoiceChatHandler.cpp
+ Entities/Player/CharacterHandler.cpp
+ Entities/Unit/StatSystem.cpp
+ Entities/Unit/Unit.cpp
+ Entities/Unit/Unit.h
+ Entities/Totem/Totem.cpp
+ Entities/Totem/Totem.h
+ Entities/Vehicle/Vehicle.cpp
+ Entities/Vehicle/Vehicle.h
+ Events/GameEventMgr.cpp
+ Events/GameEventMgr.h
+ Events/GlobalEvents.cpp
+ Events/GlobalEvents.h
+ Events/UnitEvents.h
+ Globals/Formulas.h
+ Globals/Language.h
+ Globals/SharedDefines.h
+ Groups/Group.cpp
+ Groups/Group.h
+ Groups/GroupHandler.cpp
+ Groups/GroupReference.cpp
+ Groups/GroupReference.h
+ Groups/GroupRefManager.h
+ Guilds/Guild.cpp
+ Guilds/Guild.h
+ Guilds/GuildHandler.cpp
+ Instances/InstanceData.cpp
+ Instances/InstanceData.h
+ Instances/InstanceSaveMgr.cpp
+ Instances/InstanceSaveMgr.h
+ LookingForGroup/LFG.h
+ LookingForGroup/LFGHandler.cpp
+ LookingForGroup/LFGMgr.cpp
+ LookingForGroup/LFGMgr.h
+ Loot/LootHandler.cpp
+ Loot/LootMgr.cpp
+ Loot/LootMgr.h
+ Mails/Mail.cpp
+ Mails/Mail.h
+ Map/Cell/Cell.h
+ Map/Cell/CellImpl.h
+ Map/Grid/GridDefines.h
+ Map/Grid/GridNotifiers.cpp
+ Map/Grid/GridNotifiers.h
+ Map/Grid/GridNotifiersImpl.h
+ Map/Grid/GridStates.cpp
+ Map/Grid/GridStates.h
+ Map/Grid/ObjectGridLoader.cpp
+ Map/Grid/ObjectGridLoader.h
+ Map/Map.cpp
+ Map/Map.h
+ Map/MapInstanced.cpp
+ Map/MapInstanced.h
+ Map/MapManager.cpp
+ Map/MapManager.h
+ Map/MapUpdater.cpp
+ Map/MapUpdater.h
+ Map/MapReference.h
+ Map/MapRefManager.h
+ Map/ObjectPosSelector.cpp
+ Map/ObjectPosSelector.h
+ Map/ZoneScript.h
+ Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+ Movement/MovementGenerators/ConfusedMovementGenerator.h
+ Movement/MovementGenerators/FleeingMovementGenerator.cpp
+ Movement/MovementGenerators/FleeingMovementGenerator.h
+ Movement/MovementGenerators/HomeMovementGenerator.cpp
+ Movement/MovementGenerators/HomeMovementGenerator.h
+ Movement/MovementGenerators/IdleMovementGenerator.cpp
+ Movement/MovementGenerators/IdleMovementGenerator.h
+ Movement/MovementGenerators/MovementGenerator.cpp
+ Movement/MovementGenerators/MovementGenerator.h
+ Movement/MovementGenerators/MovementGeneratorImpl.h
+ Movement/MovementGenerators/PointMovementGenerator.cpp
+ Movement/MovementGenerators/PointMovementGenerator.h
+ Movement/MovementGenerators/RandomMovementGenerator.cpp
+ Movement/MovementGenerators/RandomMovementGenerator.h
+ Movement/MovementGenerators/TargetedMovementGenerator.cpp
+ Movement/MovementGenerators/TargetedMovementGenerator.h
+ Movement/MovementGenerators/WaypointMovementGenerator.cpp
+ Movement/MovementGenerators/WaypointMovementGenerator.h
+ Movement/DestinationHolder.cpp
+ Movement/DestinationHolder.h
+ Movement/DestinationHolderImp.h
+ Movement/FollowerReference.cpp
+ Movement/FollowerReference.h
+ Movement/FollowerRefManager.h
+ Movement/MotionMaster.cpp
+ Movement/MotionMaster.h
+ Movement/MovementHandler.cpp
+ Movement/Path.h
+ Movement/TaxiHandler.cpp
+ Movement/Transports.cpp
+ Movement/Transports.h
+ Movement/Traveller.h
+ Movement/WaypointManager.cpp
+ Movement/WaypointManager.h
+ Opcodes/Opcodes.cpp
+ Opcodes/Opcodes.h
+ OutdoorPvP/OutdoorPvP.cpp
+ OutdoorPvP/OutdoorPvP.h
+ OutdoorPvP/OutdoorPvPEP.cpp
+ OutdoorPvP/OutdoorPvPEP.h
+ OutdoorPvP/OutdoorPvPHP.cpp
+ OutdoorPvP/OutdoorPvPHP.h
+ OutdoorPvP/OutdoorPvPImpl.h
+ OutdoorPvP/OutdoorPvPMgr.cpp
+ OutdoorPvP/OutdoorPvPMgr.h
+ OutdoorPvP/OutdoorPvPNA.cpp
+ OutdoorPvP/OutdoorPvPNA.h
+ OutdoorPvP/OutdoorPvPSI.cpp
+ OutdoorPvP/OutdoorPvPSI.h
+ OutdoorPvP/OutdoorPvPTF.cpp
+ OutdoorPvP/OutdoorPvPTF.h
+ OutdoorPvP/OutdoorPvPZM.cpp
+ OutdoorPvP/OutdoorPvPZM.h
+ Pools/PoolHandler.cpp
+ Pools/PoolHandler.h
+ Quests/QueryHandler.cpp
+ Quests/QuestDef.cpp
+ Quests/QuestDef.h
+ Quests/QuestHandler.cpp
+ Reputation/ReputationMgr.cpp
+ Reputation/ReputationMgr.h
+ ScriptMgr/ScriptLoader.cpp
+ ScriptMgr/ScriptLoader.h
+ ScriptMgr/ScriptMgr.cpp
+ ScriptMgr/ScriptMgr.h
+ ScriptMgr/ScriptSystem.cpp
+ ScriptMgr/ScriptSystem.h
+ Skills/SkillHandler.cpp
+ Skills/SkillDiscovery.cpp
+ Skills/SkillDiscovery.h
+ Skills/SkillExtraItems.cpp
+ Skills/SkillExtraItems.h
+ Spells/Auras/SpellAuraDefines.h
+ Spells/Auras/SpellAuras.cpp
+ Spells/Auras/SpellAuras.h
+ Spells/Auras/SpellAuraEffects.cpp
+ Spells/Auras/SpellAuraEffects.h
+ Spells/Auras/SpellEffects.cpp
+ Spells/Spell.cpp
+ Spells/Spell.h
+ Spells/SpellHandler.cpp
+ Spells/SpellMgr.cpp
+ Spells/SpellMgr.h
+ Tools/PlayerDump.cpp
+ Tools/PlayerDump.h
+ Tools/Tools.cpp
+ Tools/Tools.h
+ Weather/Weather.cpp
+ Weather/Weather.h
+ World/World.cpp
+ World/World.h
+ World/WorldLog.cpp
+ World/WorldLog.h
+ World/WorldSession.cpp
+ World/WorldSession.h
+ World/WorldSocket.cpp
+ World/WorldSocket.h
+ World/WorldSocketMgr.cpp
+ World/WorldSocketMgr.h
)
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/dep/include
- ${CMAKE_SOURCE_DIR}/src/framework
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/shared/vmap
- ${CMAKE_SOURCE_DIR}/src/shared/Database
- ${CMAKE_SOURCE_DIR}/src/game
+ ${CMAKE_SOURCE_DIR}/src/server/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/shared/vmap
+ ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+ ${CMAKE_SOURCE_DIR}/src/server/game
+ ${CMAKE_SOURCE_DIR}/src/server/game/Account
+ ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
+ ${CMAKE_SOURCE_DIR}/src/server/game/Addons
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/AuctionHouseBot
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/EventAI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
+ ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
+ ${CMAKE_SOURCE_DIR}/src/server/game/Chat
+ ${CMAKE_SOURCE_DIR}/src/server/game/Combat
+ ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
+ ${CMAKE_SOURCE_DIR}/src/server/game/Events
+ ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+ ${CMAKE_SOURCE_DIR}/src/server/game/Groups
+ ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Instances
+ ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup
+ ${CMAKE_SOURCE_DIR}/src/server/game/Loot
+ ${CMAKE_SOURCE_DIR}/src/server/game/Mails
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid
+ ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+ ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
+ ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
+ ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
+ ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+ ${CMAKE_SOURCE_DIR}/src/server/game/Quests
+ ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
+ ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/Skills
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
+ ${CMAKE_SOURCE_DIR}/src/server/game/Tools
+ ${CMAKE_SOURCE_DIR}/src/server/game/Weather
+ ${CMAKE_SOURCE_DIR}/src/server/game/World
${MYSQL_INCLUDE_DIR}
)
if(NOT DO_SCRIPTS)
SET(game_STAT_SRCS ${game_STAT_SRCS}
- ScriptedEscortAI.cpp
- ScriptedEscortAI.h
- ScriptedPch.cpp
- ScriptedPch.h
- ScriptedCreature.cpp
- ScriptedCreature.h
- ScriptedFollowerAI.cpp
- ScriptedFollowerAI.h
- ScriptedGossip.h
- ScriptedGuardAI.cpp
- ScriptedGuardAI.h
- ScriptedInstance.h
- ScriptedSimpleAI.cpp
- ScriptedSimpleAI.h
+ AI/ScriptedAI/ScriptedEscortAI.cpp
+ AI/ScriptedAI/ScriptedEscortAI.h
+ ScriptMgr/ScriptedPch.cpp
+ ScriptMgr/ScriptedPch.h
+ AI/ScriptedAI/ScriptedCreature.cpp
+ AI/ScriptedAI/ScriptedCreature.h
+ AI/ScriptedAI/ScriptedFollowerAI.cpp
+ AI/ScriptedAI/ScriptedFollowerAI.h
+ AI/ScriptedAI/ScriptedGossip.h
+ AI/ScriptedAI/ScriptedGuardAI.cpp
+ AI/ScriptedAI/ScriptedGuardAI.h
+ AI/ScriptedAI/ScriptedInstance.h
+ AI/ScriptedAI/ScriptedSimpleAI.cpp
+ AI/ScriptedAI/ScriptedSimpleAI.h
)
message("-- Added Script Engine to GAME lib")
endif(NOT DO_SCRIPTS)
@@ -353,6 +402,6 @@ ADD_DEPENDENCIES(game revision.h)
# Generate precompiled header
IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
- ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/game/pchlinux.h)
+ ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/pchlinux.h)
ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
diff --git a/src/server/game/Calendar/Calendar.cpp b/src/server/game/Calendar/Calendar.cpp
new file mode 100644
index 00000000000..0c1efb20f87
--- /dev/null
+++ b/src/server/game/Calendar/Calendar.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; 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
+ */
diff --git a/src/server/game/Calendar/Calendar.h b/src/server/game/Calendar/Calendar.h
new file mode 100644
index 00000000000..2d35a6c23c7
--- /dev/null
+++ b/src/server/game/Calendar/Calendar.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; 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 TRINITY_CALENDAR_H
+#define TRINITY_CALENDAR_H
+
+class Calendar
+{
+
+};
+#endif
diff --git a/src/server/game/Calendar/CalendarHandler.cpp b/src/server/game/Calendar/CalendarHandler.cpp
new file mode 100644
index 00000000000..f6679c5d5ac
--- /dev/null
+++ b/src/server/game/Calendar/CalendarHandler.cpp
@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; 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
+ */
+
+#include "Common.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+
+#include "InstanceSaveMgr.h"
+#include "Log.h"
+#include "Opcodes.h"
+#include "Player.h"
+
+void WorldSession::HandleCalendarGetCalendar(WorldPacket & /*recv_data*/)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_GET_CALENDAR"); // empty
+
+ time_t cur_time = time(NULL);
+
+ WorldPacket data(SMSG_CALENDAR_SEND_CALENDAR,4+4*0+4+4*0+4+4);
+
+ data << uint32(0); // invite count
+ /*
+ for (;;)
+ {
+ uint64 inviteId;
+ uint64 unkGuid0;
+ uint8 unk1, unk2, unk3;
+ uint64 creatorGuid;
+ }
+ */
+
+ data << uint32(0); // event count
+ /*
+ for (;;)
+ {
+ uint64 eventId;
+ std::string title; // 128 chars
+ uint32 type;
+ uint32 occurrenceTime;
+ uint32 flags;
+ uint32 unk4; -- possibly mapid for dungeon/raid
+ uint64 creatorGuid;
+ }
+ */
+
+ data << uint32(0); // unk
+ data << uint32(secsToTimeBitFields(cur_time)); // current time
+
+ uint32 counter = 0;
+ size_t p_counter = data.wpos();
+ data << uint32(counter); // instance save count
+
+ for (int i = 0; i < MAX_DIFFICULTY; ++i)
+ {
+ for (Player::BoundInstancesMap::const_iterator itr = _player->m_boundInstances[i].begin(); itr != _player->m_boundInstances[i].end(); ++itr)
+ {
+ if (itr->second.perm)
+ {
+ InstanceSave *save = itr->second.save;
+ data << uint32(save->GetMapId());
+ data << uint32(save->GetDifficulty());
+ data << uint32(save->GetResetTime() - cur_time);
+ data << uint64(save->GetInstanceId()); // instance save id as unique instance copy id
+ ++counter;
+ }
+ }
+ }
+
+ data.put<uint32>(p_counter, counter);
+
+ data << uint32(1135753200); // unk (28.12.2005 12:00)
+
+ counter = 0;
+ p_counter = data.wpos();
+ data << uint32(counter); // raid reset count
+
+ ResetTimeByMapDifficultyMap const& resets = sInstanceSaveManager.GetResetTimeMap();
+ for (ResetTimeByMapDifficultyMap::const_iterator itr = resets.begin(); itr != resets.end(); ++itr)
+ {
+ uint32 mapid = PAIR32_LOPART(itr->first);
+ MapEntry const* mapEnt = sMapStore.LookupEntry(mapid);
+ if (!mapEnt || !mapEnt->IsRaid())
+ continue;
+
+ data << uint32(mapid);
+ data << uint32(itr->second - cur_time);
+ data << uint32(mapEnt->unk_time);
+ ++counter;
+ }
+
+ data.put<uint32>(p_counter, counter);
+
+ data << uint32(0); // holiday count?
+ /*
+ for (;;)
+ {
+ uint32 unk5, unk6, unk7, unk8, unk9;
+ for (uint32 j = 0; j < 26; ++j)
+ {
+ uint32 unk10;
+ }
+ for (uint32 j = 0; j < 10; ++j)
+ {
+ uint32 unk11;
+ }
+ for (uint32 j = 0; j < 10; ++j)
+ {
+ uint32 unk12;
+ }
+ std::string holidayName; // 64 chars
+ }
+ */
+
+ sLog.outDebug("Sending calendar");
+ data.hexlike();
+ SendPacket(&data);
+}
+
+void WorldSession::HandleCalendarGetEvent(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_GET_EVENT");
+ recv_data.hexlike();
+ recv_data.read_skip<uint64>(); // unk
+}
+
+void WorldSession::HandleCalendarGuildFilter(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_GUILD_FILTER");
+ recv_data.hexlike();
+ recv_data.read_skip<uint32>(); // unk1
+ recv_data.read_skip<uint32>(); // unk2
+ recv_data.read_skip<uint32>(); // unk3
+}
+
+void WorldSession::HandleCalendarArenaTeam(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_ARENA_TEAM");
+ recv_data.hexlike();
+ recv_data.read_skip<uint32>(); // unk
+}
+
+void WorldSession::HandleCalendarAddEvent(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_ADD_EVENT");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //std::string unk1, unk2;
+ //recv_data >> (std::string)unk1;
+ //recv_data >> (std::string)unk2;
+
+ //uint8 unk3, unk4;
+ //uint32 unk5, unk6, unk7, unk8, unk9, count = 0;
+ //recv_data >> (uint8)unk3;
+ //recv_data >> (uint8)unk4;
+ //recv_data >> (uint32)unk5;
+ //recv_data >> (uint32)unk6;
+ //recv_data >> (uint32)unk7;
+ //recv_data >> (uint32)unk8;
+ //recv_data >> (uint32)unk9;
+ //if (!((unk9 >> 6) & 1))
+ //{
+ // recv_data >> (uint32)count;
+ // if (count)
+ // {
+ // uint8 unk12,unk13;
+ // uint64 guid;
+ // for (int i=0; i<count; i++)
+ // {
+ // recv_data.readPackGUID(guid);
+ // recv_data >> (uint8)unk12;
+ // recv_data >> (uint8)unk13;
+ // }
+ // }
+ //}
+}
+
+void WorldSession::HandleCalendarUpdateEvent(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_UPDATE_EVENT");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> std::string
+ //recv_data >> std::string
+ //recv_data >> uint8
+ //recv_data >> uint8
+ //recv_data >> uint32
+ //recv_data >> uint32
+ //recv_data >> uint32
+ //recv_data >> uint32
+ //recv_data >> uint32
+}
+
+void WorldSession::HandleCalendarRemoveEvent(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_REMOVE_EVENT");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> uint32
+
+}
+
+void WorldSession::HandleCalendarCopyEvent(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_COPY_EVENT");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> uint32
+
+}
+
+void WorldSession::HandleCalendarEventInvite(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_INVITE");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> std::string
+ //recv_data >> uint8
+ //recv_data >> uint8
+
+}
+
+void WorldSession::HandleCalendarEventRsvp(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_RSVP");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> uint32
+
+}
+
+void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_REMOVE_INVITE");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //recv_data.readPackGUID(guid)
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> uint64
+}
+
+void WorldSession::HandleCalendarEventStatus(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_STATUS");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //recv_data.readPackGUID(guid)
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> uint32
+}
+
+void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_MODERATOR_STATUS");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //recv_data.readPackGUID(guid)
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> uint32
+}
+
+void WorldSession::HandleCalendarComplain(WorldPacket &recv_data)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_COMPLAIN");
+ recv_data.hexlike();
+ recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam
+
+ //recv_data >> uint64
+ //recv_data >> uint64
+ //recv_data >> uint64
+}
+
+void WorldSession::HandleCalendarGetNumPending(WorldPacket & /*recv_data*/)
+{
+ sLog.outDebug("WORLD: CMSG_CALENDAR_GET_NUM_PENDING"); // empty
+
+ WorldPacket data(SMSG_CALENDAR_SEND_NUM_PENDING, 4);
+ data << uint32(0); // 0 - no pending invites, 1 - some pending invites
+ SendPacket(&data);
+}
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index c61054fd5b2..d29670e4fc9 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -4,20 +4,20 @@ IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
SET(scripts_STAT_SRCS
- ../game/ScriptedPch.cpp
- ../game/ScriptedPch.h
- ../game/ScriptedEscortAI.cpp
- ../game/ScriptedEscortAI.h
- ../game/ScriptedCreature.cpp
- ../game/ScriptedCreature.h
- ../game/ScriptedFollowerAI.cpp
- ../game/ScriptedFollowerAI.h
- ../game/ScriptedGossip.h
- ../game/ScriptedGuardAI.cpp
- ../game/ScriptedGuardAI.h
- ../game/ScriptedInstance.h
- ../game/ScriptedSimpleAI.cpp
- ../game/ScriptedSimpleAI.h
+ ../game/ScriptMgr/ScriptedPch.cpp
+ ../game/ScriptMgr/ScriptedPch.h
+ ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
+ ../game/AI/ScriptedAI/ScriptedEscortAI.h
+ ../game/AI/ScriptedAI/ScriptedCreature.cpp
+ ../game/AI/ScriptedAI/ScriptedCreature.h
+ ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+ ../game/AI/ScriptedAI/ScriptedFollowerAI.h
+ ../game/AI/ScriptedAI/ScriptedGossip.h
+ ../game/AI/ScriptedAI/ScriptedGuardAI.cpp
+ ../game/AI/ScriptedAI/ScriptedGuardAI.h
+ ../game/AI/ScriptedAI/ScriptedInstance.h
+ ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
+ ../game/AI/ScriptedAI/ScriptedSimpleAI.h
custom/on_events.cpp
eastern_kingdoms/alterac_valley/alterac_valley.cpp
eastern_kingdoms/alterac_valley/boss_balinda.cpp
@@ -582,11 +582,54 @@ message("-- Added Script Engine to SCRIPTS lib")
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/framework
- ${CMAKE_SOURCE_DIR}/src/game
- ${CMAKE_SOURCE_DIR}/src/shared/Database
${CMAKE_SOURCE_DIR}/dep/include
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+ ${CMAKE_SOURCE_DIR}/src/server/game/Account
+ ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
+ ${CMAKE_SOURCE_DIR}/src/server/game/Addons
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
+ ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
+ ${CMAKE_SOURCE_DIR}/src/server/game/Chat
+ ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/Combat
+ ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
+ ${CMAKE_SOURCE_DIR}/src/server/game/Events
+ ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+ ${CMAKE_SOURCE_DIR}/src/server/game/Groups
+ ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Instances
+ ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup
+ ${CMAKE_SOURCE_DIR}/src/server/game/Loot
+ ${CMAKE_SOURCE_DIR}/src/server/game/Mails
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid
+ ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+ ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
+ ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
+ ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+ ${CMAKE_SOURCE_DIR}/src/server/game/Quests
+ ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
+ ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/Skills
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
+ ${CMAKE_SOURCE_DIR}/src/server/game/Tools
+ ${CMAKE_SOURCE_DIR}/src/server/game/Weather
+ ${CMAKE_SOURCE_DIR}/src/server/game/World
${MYSQL_INCLUDE_DIR}
)
@@ -594,5 +637,5 @@ add_library(scripts STATIC ${scripts_STAT_SRCS})
# Generate precompiled header
IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
- ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/game/ScriptedPch.h)
+ ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr/ScriptedPch.h)
ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
diff --git a/src/server/shared/Auth/CMakeLists.txt b/src/server/shared/Auth/CMakeLists.txt
index c843a6b0f35..6e5d10d40e5 100644
--- a/src/server/shared/Auth/CMakeLists.txt
+++ b/src/server/shared/Auth/CMakeLists.txt
@@ -19,8 +19,8 @@ SET(trinityauth_STAT_SRCS
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/framework
${MYSQL_INCLUDE_DIR}
)
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index d00f8b83fb8..ed43a4eb6cd 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -30,8 +30,8 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/dep/include
${CMAKE_SOURCE_DIR}/dep/include/sockets
- ${CMAKE_SOURCE_DIR}/src/framework
- ${CMAKE_SOURCE_DIR}/src/shared
+ ${CMAKE_SOURCE_DIR}/src/server/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared
${MYSQL_INCLUDE_DIR}
)
diff --git a/src/server/shared/Config/CMakeLists.txt b/src/server/shared/Config/CMakeLists.txt
index 98065034f08..da1c2e8aa3b 100644
--- a/src/server/shared/Config/CMakeLists.txt
+++ b/src/server/shared/Config/CMakeLists.txt
@@ -14,8 +14,8 @@ SET(trinityconfig_STAT_SRCS
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/framework
)
add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt
index 405a5f89a57..e30c8ae3ca2 100644
--- a/src/server/shared/Database/CMakeLists.txt
+++ b/src/server/shared/Database/CMakeLists.txt
@@ -21,9 +21,10 @@ SET(trinitydatabase_STAT_SRCS
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/shared/Database
- ${CMAKE_SOURCE_DIR}/src/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+ ${CMAKE_SOURCE_DIR}/src/server/framework
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
${MYSQL_INCLUDE_DIR}
)
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index 379388d7997..7646a451eb4 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -22,7 +22,7 @@
#include "Config/ConfigEnv.h"
#include "Common.h"
-#include "../../game/UpdateFields.h"
+#include "UpdateFields.h"
#include "Util.h"
#include "Policies/SingletonImp.h"
diff --git a/src/server/shared/vmap/CMakeLists.txt b/src/server/shared/vmap/CMakeLists.txt
index c930a0c5a25..7d865d354e7 100644
--- a/src/server/shared/vmap/CMakeLists.txt
+++ b/src/server/shared/vmap/CMakeLists.txt
@@ -23,7 +23,7 @@ SET(vmaps_STAT_SRCS
include_directories(
${ACE_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/src/framework
+ ${CMAKE_SOURCE_DIR}/src/server/framework
${CMAKE_SOURCE_DIR}/dep/include/g3dlite
)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 0efdc63c09e..3adfbf0339f 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -17,10 +17,61 @@ include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/dep/include
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/shared/Database
- ${CMAKE_SOURCE_DIR}/src/framework
- ${CMAKE_SOURCE_DIR}/src/game
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+ ${CMAKE_SOURCE_DIR}/src/server/shared/vmap
+ ${CMAKE_SOURCE_DIR}/src/server/framework
+ ${CMAKE_SOURCE_DIR}/src/server/game
+ ${CMAKE_SOURCE_DIR}/src/server/game/Account
+ ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
+ ${CMAKE_SOURCE_DIR}/src/server/game/Addons
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/AuctionHouseBot
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/EventAI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
+ ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
+ ${CMAKE_SOURCE_DIR}/src/server/game/Chat
+ ${CMAKE_SOURCE_DIR}/src/server/game/Combat
+ ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
+ ${CMAKE_SOURCE_DIR}/src/server/game/Events
+ ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+ ${CMAKE_SOURCE_DIR}/src/server/game/Groups
+ ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Instances
+ ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup
+ ${CMAKE_SOURCE_DIR}/src/server/game/Loot
+ ${CMAKE_SOURCE_DIR}/src/server/game/Mails
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid
+ ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+ ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
+ ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
+ ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
+ ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+ ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
+ ${CMAKE_SOURCE_DIR}/src/server/game/Quests
+ ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
+ ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/Skills
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
+ ${CMAKE_SOURCE_DIR}/src/server/game/Tools
+ ${CMAKE_SOURCE_DIR}/src/server/game/Weather
+ ${CMAKE_SOURCE_DIR}/src/server/game/World
${MYSQL_INCLUDE_DIR}
)
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 42c7817699f..fd4994b67ed 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -20,11 +20,11 @@ ADD_DEFINITIONS("-Wall")
ADD_DEFINITIONS("-ggdb")
ADD_DEFINITIONS("-O3")
-include_directories(../../src/shared/vmap/)
+include_directories(../../src/server/shared/vmap/)
include_directories(../../dep/include/g3dlite/)
include_directories(../../dep/ACE_wrappers/)
include_directories(../../objdir/dep/ACE_wrappers)
-include_directories(../../src/framework/)
+include_directories(../../src/server/framework/)
add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
../../dep/src/g3dlite/Box.cpp