Correctly redo file moves/renames from rev. 8416.

--HG--
branch : trunk
rename : src/server/game/AuctionHouseBot.cpp => src/server/game/AI/AuctionHouseBot/AuctionHouseBot.cpp
rename : src/server/game/AuctionHouseBot.h => src/server/game/AI/AuctionHouseBot/AuctionHouseBot.h
rename : src/server/game/CombatAI.cpp => src/server/game/AI/CombatAI.cpp
rename : src/server/game/CombatAI.h => src/server/game/AI/CombatAI.h
rename : src/server/game/CreatureAI.cpp => src/server/game/AI/CreatureAI.cpp
rename : src/server/game/CreatureAI.h => src/server/game/AI/CreatureAI.h
rename : src/server/game/CreatureAIFactory.h => src/server/game/AI/CreatureAIFactory.h
rename : src/server/game/CreatureAIImpl.h => src/server/game/AI/CreatureAIImpl.h
rename : src/server/game/CreatureAIRegistry.cpp => src/server/game/AI/CreatureAIRegistry.cpp
rename : src/server/game/CreatureAIRegistry.h => src/server/game/AI/CreatureAIRegistry.h
rename : src/server/game/CreatureAISelector.cpp => src/server/game/AI/CreatureAISelector.cpp
rename : src/server/game/CreatureAISelector.h => src/server/game/AI/CreatureAISelector.h
rename : src/server/game/CreatureEventAI.cpp => src/server/game/AI/EventAI/CreatureEventAI.cpp
rename : src/server/game/CreatureEventAI.h => src/server/game/AI/EventAI/CreatureEventAI.h
rename : src/server/game/CreatureEventAIMgr.cpp => src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
rename : src/server/game/CreatureEventAIMgr.h => src/server/game/AI/EventAI/CreatureEventAIMgr.h
rename : src/server/game/GuardAI.cpp => src/server/game/AI/GuardAI.cpp
rename : src/server/game/GuardAI.h => src/server/game/AI/GuardAI.h
rename : src/server/game/PassiveAI.cpp => src/server/game/AI/PassiveAI.cpp
rename : src/server/game/PassiveAI.h => src/server/game/AI/PassiveAI.h
rename : src/server/game/PetAI.cpp => src/server/game/AI/PetAI.cpp
rename : src/server/game/PetAI.h => src/server/game/AI/PetAI.h
rename : src/server/game/ReactorAI.cpp => src/server/game/AI/ReactorAI.cpp
rename : src/server/game/ReactorAI.h => src/server/game/AI/ReactorAI.h
rename : src/server/game/ScriptedCreature.cpp => src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
rename : src/server/game/ScriptedCreature.h => src/server/game/AI/ScriptedAI/ScriptedCreature.h
rename : src/server/game/ScriptedEscortAI.cpp => src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
rename : src/server/game/ScriptedEscortAI.h => src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
rename : src/server/game/ScriptedFollowerAI.cpp => src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
rename : src/server/game/ScriptedFollowerAI.h => src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
rename : src/server/game/ScriptedGossip.h => src/server/game/AI/ScriptedAI/ScriptedGossip.h
rename : src/server/game/ScriptedGuardAI.cpp => src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp
rename : src/server/game/ScriptedGuardAI.h => src/server/game/AI/ScriptedAI/ScriptedGuardAI.h
rename : src/server/game/ScriptedInstance.h => src/server/game/AI/ScriptedAI/ScriptedInstance.h
rename : src/server/game/ScriptedSimpleAI.cpp => src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp
rename : src/server/game/ScriptedSimpleAI.h => src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h
rename : src/server/game/ScriptedSmartAI.cpp => src/server/game/AI/ScriptedAI/ScriptedSmartAI.cpp
rename : src/server/game/ScriptedSmartAI.h => src/server/game/AI/ScriptedAI/ScriptedSmartAI.h
rename : src/server/game/TotemAI.cpp => src/server/game/AI/TotemAI.cpp
rename : src/server/game/TotemAI.h => src/server/game/AI/TotemAI.h
rename : src/server/game/UnitAI.cpp => src/server/game/AI/UnitAI.cpp
rename : src/server/game/UnitAI.h => src/server/game/AI/UnitAI.h
rename : src/server/game/AccountMgr.cpp => src/server/game/Account/AccountMgr.cpp
rename : src/server/game/AccountMgr.h => src/server/game/Account/AccountMgr.h
rename : src/server/game/AchievementMgr.cpp => src/server/game/Achievements/AchievementMgr.cpp
rename : src/server/game/AchievementMgr.h => src/server/game/Achievements/AchievementMgr.h
rename : src/server/game/AddonHandler.cpp => src/server/game/Addons/AddonHandler.cpp
rename : src/server/game/AddonHandler.h => src/server/game/Addons/AddonHandler.h
rename : src/server/game/AddonMgr.cpp => src/server/game/Addons/AddonMgr.cpp
rename : src/server/game/AddonMgr.h => src/server/game/Addons/AddonMgr.h
rename : src/server/game/AuctionHouseHandler.cpp => src/server/game/AuctionHouse/AuctionHouseHandler.cpp
rename : src/server/game/AuctionHouseMgr.cpp => src/server/game/AuctionHouse/AuctionHouseMgr.cpp
rename : src/server/game/AuctionHouseMgr.h => src/server/game/AuctionHouse/AuctionHouseMgr.h
rename : src/server/game/ArenaTeam.cpp => src/server/game/BattleGrounds/ArenaTeam.cpp
rename : src/server/game/ArenaTeam.h => src/server/game/BattleGrounds/ArenaTeam.h
rename : src/server/game/ArenaTeamHandler.cpp => src/server/game/BattleGrounds/ArenaTeamHandler.cpp
rename : src/server/game/BattleGround.cpp => src/server/game/BattleGrounds/BattleGround.cpp
rename : src/server/game/BattleGround.h => src/server/game/BattleGrounds/BattleGround.h
rename : src/server/game/BattleGroundAA.cpp => src/server/game/BattleGrounds/BattleGroundAA.cpp
rename : src/server/game/BattleGroundAA.h => src/server/game/BattleGrounds/BattleGroundAA.h
rename : src/server/game/BattleGroundAB.cpp => src/server/game/BattleGrounds/BattleGroundAB.cpp
rename : src/server/game/BattleGroundAB.h => src/server/game/BattleGrounds/BattleGroundAB.h
rename : src/server/game/BattleGroundAV.cpp => src/server/game/BattleGrounds/BattleGroundAV.cpp
rename : src/server/game/BattleGroundAV.h => src/server/game/BattleGrounds/BattleGroundAV.h
rename : src/server/game/BattleGroundBE.cpp => src/server/game/BattleGrounds/BattleGroundBE.cpp
rename : src/server/game/BattleGroundBE.h => src/server/game/BattleGrounds/BattleGroundBE.h
rename : src/server/game/BattleGroundDS.cpp => src/server/game/BattleGrounds/BattleGroundDS.cpp
rename : src/server/game/BattleGroundDS.h => src/server/game/BattleGrounds/BattleGroundDS.h
rename : src/server/game/BattleGroundEY.cpp => src/server/game/BattleGrounds/BattleGroundEY.cpp
rename : src/server/game/BattleGroundEY.h => src/server/game/BattleGrounds/BattleGroundEY.h
rename : src/server/game/BattleGroundHandler.cpp => src/server/game/BattleGrounds/BattleGroundHandler.cpp
rename : src/server/game/BattleGroundIC.cpp => src/server/game/BattleGrounds/BattleGroundIC.cpp
rename : src/server/game/BattleGroundIC.h => src/server/game/BattleGrounds/BattleGroundIC.h
rename : src/server/game/BattleGroundMgr.cpp => src/server/game/BattleGrounds/BattleGroundMgr.cpp
rename : src/server/game/BattleGroundMgr.h => src/server/game/BattleGrounds/BattleGroundMgr.h
rename : src/server/game/BattleGroundNA.cpp => src/server/game/BattleGrounds/BattleGroundNA.cpp
rename : src/server/game/BattleGroundNA.h => src/server/game/BattleGrounds/BattleGroundNA.h
rename : src/server/game/BattleGroundRB.cpp => src/server/game/BattleGrounds/BattleGroundRB.cpp
rename : src/server/game/BattleGroundRB.h => src/server/game/BattleGrounds/BattleGroundRB.h
rename : src/server/game/BattleGroundRL.cpp => src/server/game/BattleGrounds/BattleGroundRL.cpp
rename : src/server/game/BattleGroundRL.h => src/server/game/BattleGrounds/BattleGroundRL.h
rename : src/server/game/BattleGroundRV.cpp => src/server/game/BattleGrounds/BattleGroundRV.cpp
rename : src/server/game/BattleGroundRV.h => src/server/game/BattleGrounds/BattleGroundRV.h
rename : src/server/game/BattleGroundSA.cpp => src/server/game/BattleGrounds/BattleGroundSA.cpp
rename : src/server/game/BattleGroundSA.h => src/server/game/BattleGrounds/BattleGroundSA.h
rename : src/server/game/BattleGroundWS.cpp => src/server/game/BattleGrounds/BattleGroundWS.cpp
rename : src/server/game/BattleGroundWS.h => src/server/game/BattleGrounds/BattleGroundWS.h
rename : src/server/game/Calendar.cpp => src/server/game/Calender/Calendar.cpp
rename : src/server/game/Calendar.h => src/server/game/Calender/Calendar.h
rename : src/server/game/CalendarHandler.cpp => src/server/game/Calender/CalendarHandler.cpp
rename : src/server/game/Channel.cpp => src/server/game/Chat/Channel.cpp
rename : src/server/game/Channel.h => src/server/game/Chat/Channel.h
rename : src/server/game/ChannelHandler.cpp => src/server/game/Chat/ChannelHandler.cpp
rename : src/server/game/ChannelMgr.cpp => src/server/game/Chat/ChannelMgr.cpp
rename : src/server/game/ChannelMgr.h => src/server/game/Chat/ChannelMgr.h
rename : src/server/game/Chat.cpp => src/server/game/Chat/Chat.cpp
rename : src/server/game/Chat.h => src/server/game/Chat/Chat.h
rename : src/server/game/ChatHandler.cpp => src/server/game/Chat/ChatHandler.cpp
rename : src/server/game/Debugcmds.cpp => src/server/game/Chat/Debugcmds.cpp
rename : src/server/game/Level0.cpp => src/server/game/Chat/Level0.cpp
rename : src/server/game/Level1.cpp => src/server/game/Chat/Level1.cpp
rename : src/server/game/Level2.cpp => src/server/game/Chat/Level2.cpp
rename : src/server/game/Level3.cpp => src/server/game/Chat/Level3.cpp
rename : src/server/game/CombatHandler.cpp => src/server/game/Combat/CombatHandler.cpp
rename : src/server/game/HostileRefManager.cpp => src/server/game/Combat/HostileRefManager.cpp
rename : src/server/game/HostileRefManager.h => src/server/game/Combat/HostileRefManager.h
rename : src/server/game/ThreatManager.cpp => src/server/game/Combat/ThreatManager.cpp
rename : src/server/game/ThreatManager.h => src/server/game/Combat/ThreatManager.h
rename : src/server/game/ConditionMgr.cpp => src/server/game/ConditionMgr/ConditionMgr.cpp
rename : src/server/game/ConditionMgr.h => src/server/game/ConditionMgr/ConditionMgr.h
rename : src/server/game/DBCEnums.h => src/server/game/DataStores/DBCEnums.h
rename : src/server/game/DBCStores.cpp => src/server/game/DataStores/DBCStores.cpp
rename : src/server/game/DBCStores.h => src/server/game/DataStores/DBCStores.h
rename : src/server/game/DBCStructure.h => src/server/game/DataStores/DBCStructure.h
rename : src/server/game/DBCfmt.h => src/server/game/DataStores/DBCfmt.h
rename : src/server/game/Creature.cpp => src/server/game/Entities/Creature/Creature.cpp
rename : src/server/game/Creature.h => src/server/game/Entities/Creature/Creature.h
rename : src/server/game/CreatureGroups.cpp => src/server/game/Entities/Creature/CreatureGroups.cpp
rename : src/server/game/CreatureGroups.h => src/server/game/Entities/Creature/CreatureGroups.h
rename : src/server/game/GossipDef.cpp => src/server/game/Entities/Creature/GossipDef.cpp
rename : src/server/game/GossipDef.h => src/server/game/Entities/Creature/GossipDef.h
rename : src/server/game/NPCHandler.cpp => src/server/game/Entities/Creature/NPCHandler.cpp
rename : src/server/game/NPCHandler.h => src/server/game/Entities/Creature/NPCHandler.h
rename : src/server/game/TemporarySummon.cpp => src/server/game/Entities/Creature/TemporarySummon.cpp
rename : src/server/game/TemporarySummon.h => src/server/game/Entities/Creature/TemporarySummon.h
rename : src/server/game/GameObject.cpp => src/server/game/Entities/GameObject/GameObject.cpp
rename : src/server/game/GameObject.h => src/server/game/Entities/GameObject/GameObject.h
rename : src/server/game/Bag.cpp => src/server/game/Entities/Item/Bag.cpp
rename : src/server/game/Bag.h => src/server/game/Entities/Item/Bag.h
rename : src/server/game/Item.cpp => src/server/game/Entities/Item/Item.cpp
rename : src/server/game/Item.h => src/server/game/Entities/Item/Item.h
rename : src/server/game/ItemEnchantmentMgr.cpp => src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
rename : src/server/game/ItemEnchantmentMgr.h => src/server/game/Entities/Item/ItemEnchantmentMgr.h
rename : src/server/game/ItemHandler.cpp => src/server/game/Entities/Item/ItemHandler.cpp
rename : src/server/game/ItemPrototype.h => src/server/game/Entities/Item/ItemPrototype.h
rename : src/server/game/Corpse.cpp => src/server/game/Entities/Object/Corpse.cpp
rename : src/server/game/Corpse.h => src/server/game/Entities/Object/Corpse.h
rename : src/server/game/DynamicObject.cpp => src/server/game/Entities/Object/DynamicObject.cpp
rename : src/server/game/DynamicObject.h => src/server/game/Entities/Object/DynamicObject.h
rename : src/server/game/Object.cpp => src/server/game/Entities/Object/Object.cpp
rename : src/server/game/Object.h => src/server/game/Entities/Object/Object.h
rename : src/server/game/ObjectAccessor.cpp => src/server/game/Entities/Object/ObjectAccessor.cpp
rename : src/server/game/ObjectAccessor.h => src/server/game/Entities/Object/ObjectAccessor.h
rename : src/server/game/ObjectDefines.h => src/server/game/Entities/Object/ObjectDefines.h
rename : src/server/game/ObjectMgr.cpp => src/server/game/Entities/Object/ObjectMgr.cpp
rename : src/server/game/ObjectMgr.h => src/server/game/Entities/Object/ObjectMgr.h
rename : src/server/game/UpdateData.cpp => src/server/game/Entities/Object/UpdateData.cpp
rename : src/server/game/UpdateData.h => src/server/game/Entities/Object/UpdateData.h
rename : src/server/game/UpdateFields.h => src/server/game/Entities/Object/UpdateFields.h
rename : src/server/game/UpdateMask.h => src/server/game/Entities/Object/UpdateMask.h
rename : src/server/game/Pet.cpp => src/server/game/Entities/Pet/Pet.cpp
rename : src/server/game/Pet.h => src/server/game/Entities/Pet/Pet.h
rename : src/server/game/PetHandler.cpp => src/server/game/Entities/Pet/PetHandler.cpp
rename : src/server/game/CharacterHandler.cpp => src/server/game/Entities/Player/CharacterHandler.cpp
rename : src/server/game/DuelHandler.cpp => src/server/game/Entities/Player/DuelHandler.cpp
rename : src/server/game/MiscHandler.cpp => src/server/game/Entities/Player/MiscHandler.cpp
rename : src/server/game/PetitionsHandler.cpp => src/server/game/Entities/Player/PetitionsHandler.cpp
rename : src/server/game/Player.cpp => src/server/game/Entities/Player/Player.cpp
rename : src/server/game/Player.h => src/server/game/Entities/Player/Player.h
rename : src/server/game/SocialMgr.cpp => src/server/game/Entities/Player/SocialMgr.cpp
rename : src/server/game/SocialMgr.h => src/server/game/Entities/Player/SocialMgr.h
rename : src/server/game/TicketHandler.cpp => src/server/game/Entities/Player/TicketHandler.cpp
rename : src/server/game/TradeHandler.cpp => src/server/game/Entities/Player/TradeHandler.cpp
rename : src/server/game/VoiceChatHandler.cpp => src/server/game/Entities/Player/VoiceChatHandler.cpp
rename : src/server/game/Totem.cpp => src/server/game/Entities/Totem/Totem.cpp
rename : src/server/game/Totem.h => src/server/game/Entities/Totem/Totem.h
rename : src/server/game/StatSystem.cpp => src/server/game/Entities/Unit/StatSystem.cpp
rename : src/server/game/Unit.cpp => src/server/game/Entities/Unit/Unit.cpp
rename : src/server/game/Unit.h => src/server/game/Entities/Unit/Unit.h
rename : src/server/game/Vehicle.cpp => src/server/game/Entities/Vehicle/Vehicle.cpp
rename : src/server/game/Vehicle.h => src/server/game/Entities/Vehicle/Vehicle.h
rename : src/server/game/GameEventMgr.cpp => src/server/game/Events/GameEventMgr.cpp
rename : src/server/game/GameEventMgr.h => src/server/game/Events/GameEventMgr.h
rename : src/server/game/GlobalEvents.cpp => src/server/game/Events/GlobalEvents.cpp
rename : src/server/game/GlobalEvents.h => src/server/game/Events/GlobalEvents.h
rename : src/server/game/UnitEvents.h => src/server/game/Events/UnitEvents.h
rename : src/server/game/Formulas.h => src/server/game/Globals/Formulas.h
rename : src/server/game/Language.h => src/server/game/Globals/Language.h
rename : src/server/game/SharedDefines.h => src/server/game/Globals/SharedDefines.h
rename : src/server/game/Group.cpp => src/server/game/Groups/Group.cpp
rename : src/server/game/Group.h => src/server/game/Groups/Group.h
rename : src/server/game/GroupHandler.cpp => src/server/game/Groups/GroupHandler.cpp
rename : src/server/game/GroupRefManager.h => src/server/game/Groups/GroupRefManager.h
rename : src/server/game/GroupReference.cpp => src/server/game/Groups/GroupReference.cpp
rename : src/server/game/GroupReference.h => src/server/game/Groups/GroupReference.h
rename : src/server/game/Guild.cpp => src/server/game/Guilds/Guild.cpp
rename : src/server/game/Guild.h => src/server/game/Guilds/Guild.h
rename : src/server/game/GuildHandler.cpp => src/server/game/Guilds/GuildHandler.cpp
rename : src/server/game/InstanceData.cpp => src/server/game/Instances/InstanceData.cpp
rename : src/server/game/InstanceData.h => src/server/game/Instances/InstanceData.h
rename : src/server/game/InstanceSaveMgr.cpp => src/server/game/Instances/InstanceSaveMgr.cpp
rename : src/server/game/InstanceSaveMgr.h => src/server/game/Instances/InstanceSaveMgr.h
rename : src/server/game/LFG.h => src/server/game/LookingForGroup/LFG.h
rename : src/server/game/LFGHandler.cpp => src/server/game/LookingForGroup/LFGHandler.cpp
rename : src/server/game/LFGMgr.cpp => src/server/game/LookingForGroup/LFGMgr.cpp
rename : src/server/game/LFGMgr.h => src/server/game/LookingForGroup/LFGMgr.h
rename : src/server/game/LootHandler.cpp => src/server/game/Loot/LootHandler.cpp
rename : src/server/game/LootMgr.cpp => src/server/game/Loot/LootMgr.cpp
rename : src/server/game/LootMgr.h => src/server/game/Loot/LootMgr.h
rename : src/server/game/Mail.cpp => src/server/game/Mails/Mail.cpp
rename : src/server/game/Mail.h => src/server/game/Mails/Mail.h
rename : src/server/game/Cell.h => src/server/game/Map/Cell/Cell.h
rename : src/server/game/CellImpl.h => src/server/game/Map/Cell/CellImpl.h
rename : src/server/game/GridDefines.h => src/server/game/Map/Grid/GridDefines.h
rename : src/server/game/GridNotifiers.cpp => src/server/game/Map/Grid/GridNotifiers.cpp
rename : src/server/game/GridNotifiers.h => src/server/game/Map/Grid/GridNotifiers.h
rename : src/server/game/GridNotifiersImpl.h => src/server/game/Map/Grid/GridNotifiersImpl.h
rename : src/server/game/GridStates.cpp => src/server/game/Map/Grid/GridStates.cpp
rename : src/server/game/GridStates.h => src/server/game/Map/Grid/GridStates.h
rename : src/server/game/ObjectGridLoader.cpp => src/server/game/Map/Grid/ObjectGridLoader.cpp
rename : src/server/game/ObjectGridLoader.h => src/server/game/Map/Grid/ObjectGridLoader.h
rename : src/server/game/Map.cpp => src/server/game/Map/Map.cpp
rename : src/server/game/Map.h => src/server/game/Map/Map.h
rename : src/server/game/MapInstanced.cpp => src/server/game/Map/MapInstanced.cpp
rename : src/server/game/MapInstanced.h => src/server/game/Map/MapInstanced.h
rename : src/server/game/MapManager.cpp => src/server/game/Map/MapManager.cpp
rename : src/server/game/MapManager.h => src/server/game/Map/MapManager.h
rename : src/server/game/MapRefManager.h => src/server/game/Map/MapRefManager.h
rename : src/server/game/MapReference.h => src/server/game/Map/MapReference.h
rename : src/server/game/MapUpdater.cpp => src/server/game/Map/MapUpdater.cpp
rename : src/server/game/MapUpdater.h => src/server/game/Map/MapUpdater.h
rename : src/server/game/ObjectPosSelector.cpp => src/server/game/Map/ObjectPosSelector.cpp
rename : src/server/game/ObjectPosSelector.h => src/server/game/Map/ObjectPosSelector.h
rename : src/server/game/ZoneScript.h => src/server/game/Map/ZoneScript.h
rename : src/server/game/DestinationHolder.cpp => src/server/game/Movement/DestinationHolder.cpp
rename : src/server/game/DestinationHolder.h => src/server/game/Movement/DestinationHolder.h
rename : src/server/game/DestinationHolderImp.h => src/server/game/Movement/DestinationHolderImp.h
rename : src/server/game/FollowerRefManager.h => src/server/game/Movement/FollowerRefManager.h
rename : src/server/game/FollowerReference.cpp => src/server/game/Movement/FollowerReference.cpp
rename : src/server/game/FollowerReference.h => src/server/game/Movement/FollowerReference.h
rename : src/server/game/MotionMaster.cpp => src/server/game/Movement/MotionMaster.cpp
rename : src/server/game/MotionMaster.h => src/server/game/Movement/MotionMaster.h
rename : src/server/game/ConfusedMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
rename : src/server/game/ConfusedMovementGenerator.h => src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
rename : src/server/game/FleeingMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
rename : src/server/game/FleeingMovementGenerator.h => src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
rename : src/server/game/HomeMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
rename : src/server/game/HomeMovementGenerator.h => src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
rename : src/server/game/IdleMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
rename : src/server/game/IdleMovementGenerator.h => src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
rename : src/server/game/MovementGenerator.cpp => src/server/game/Movement/MovementGenerators/MovementGenerator.cpp
rename : src/server/game/MovementGenerator.h => src/server/game/Movement/MovementGenerators/MovementGenerator.h
rename : src/server/game/MovementGeneratorImpl.h => src/server/game/Movement/MovementGenerators/MovementGeneratorImpl.h
rename : src/server/game/PointMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
rename : src/server/game/PointMovementGenerator.h => src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
rename : src/server/game/RandomMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
rename : src/server/game/RandomMovementGenerator.h => src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
rename : src/server/game/TargetedMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
rename : src/server/game/TargetedMovementGenerator.h => src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
rename : src/server/game/WaypointMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
rename : src/server/game/WaypointMovementGenerator.h => src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
rename : src/server/game/MovementHandler.cpp => src/server/game/Movement/MovementHandler.cpp
rename : src/server/game/Path.h => src/server/game/Movement/Path.h
rename : src/server/game/TaxiHandler.cpp => src/server/game/Movement/TaxiHandler.cpp
rename : src/server/game/Transports.cpp => src/server/game/Movement/Transports.cpp
rename : src/server/game/Transports.h => src/server/game/Movement/Transports.h
rename : src/server/game/Traveller.h => src/server/game/Movement/Traveller.h
rename : src/server/game/WaypointManager.cpp => src/server/game/Movement/WaypointManager.cpp
rename : src/server/game/WaypointManager.h => src/server/game/Movement/WaypointManager.h
rename : src/server/game/Opcodes.cpp => src/server/game/Opcodes/Opcodes.cpp
rename : src/server/game/Opcodes.h => src/server/game/Opcodes/Opcodes.h
rename : src/server/game/OutdoorPvP.cpp => src/server/game/OutdoorPvP/OutdoorPvP.cpp
rename : src/server/game/OutdoorPvP.h => src/server/game/OutdoorPvP/OutdoorPvP.h
rename : src/server/game/OutdoorPvPEP.cpp => src/server/game/OutdoorPvP/OutdoorPvPEP.cpp
rename : src/server/game/OutdoorPvPEP.h => src/server/game/OutdoorPvP/OutdoorPvPEP.h
rename : src/server/game/OutdoorPvPHP.cpp => src/server/game/OutdoorPvP/OutdoorPvPHP.cpp
rename : src/server/game/OutdoorPvPHP.h => src/server/game/OutdoorPvP/OutdoorPvPHP.h
rename : src/server/game/OutdoorPvPImpl.h => src/server/game/OutdoorPvP/OutdoorPvPImpl.h
rename : src/server/game/OutdoorPvPMgr.cpp => src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
rename : src/server/game/OutdoorPvPMgr.h => src/server/game/OutdoorPvP/OutdoorPvPMgr.h
rename : src/server/game/OutdoorPvPNA.cpp => src/server/game/OutdoorPvP/OutdoorPvPNA.cpp
rename : src/server/game/OutdoorPvPNA.h => src/server/game/OutdoorPvP/OutdoorPvPNA.h
rename : src/server/game/OutdoorPvPSI.cpp => src/server/game/OutdoorPvP/OutdoorPvPSI.cpp
rename : src/server/game/OutdoorPvPSI.h => src/server/game/OutdoorPvP/OutdoorPvPSI.h
rename : src/server/game/OutdoorPvPTF.cpp => src/server/game/OutdoorPvP/OutdoorPvPTF.cpp
rename : src/server/game/OutdoorPvPTF.h => src/server/game/OutdoorPvP/OutdoorPvPTF.h
rename : src/server/game/OutdoorPvPZM.cpp => src/server/game/OutdoorPvP/OutdoorPvPZM.cpp
rename : src/server/game/OutdoorPvPZM.h => src/server/game/OutdoorPvP/OutdoorPvPZM.h
rename : src/server/game/PoolHandler.cpp => src/server/game/Pools/PoolHandler.cpp
rename : src/server/game/PoolHandler.h => src/server/game/Pools/PoolHandler.h
rename : src/server/game/pchdef.cpp => src/server/game/PrecompiledHeaders/pchdef.cpp
rename : src/server/game/pchdef.h => src/server/game/PrecompiledHeaders/pchdef.h
rename : src/server/game/pchlinux.cpp => src/server/game/PrecompiledHeaders/pchlinux.cpp
rename : src/server/game/pchlinux.h => src/server/game/PrecompiledHeaders/pchlinux.h
rename : src/server/game/QueryHandler.cpp => src/server/game/Quests/QueryHandler.cpp
rename : src/server/game/QuestDef.cpp => src/server/game/Quests/QuestDef.cpp
rename : src/server/game/QuestDef.h => src/server/game/Quests/QuestDef.h
rename : src/server/game/QuestHandler.cpp => src/server/game/Quests/QuestHandler.cpp
rename : src/server/game/ReputationMgr.cpp => src/server/game/Reputation/ReputationMgr.cpp
rename : src/server/game/ReputationMgr.h => src/server/game/Reputation/ReputationMgr.h
rename : src/server/game/ScriptLoader.cpp => src/server/game/ScriptMgr/ScriptLoader.cpp
rename : src/server/game/ScriptLoader.h => src/server/game/ScriptMgr/ScriptLoader.h
rename : src/server/game/ScriptMgr.cpp => src/server/game/ScriptMgr/ScriptMgr.cpp
rename : src/server/game/ScriptMgr.h => src/server/game/ScriptMgr/ScriptMgr.h
rename : src/server/game/ScriptSystem.cpp => src/server/game/ScriptMgr/ScriptSystem.cpp
rename : src/server/game/ScriptSystem.h => src/server/game/ScriptMgr/ScriptSystem.h
rename : src/server/game/ScriptedPch.cpp => src/server/game/ScriptMgr/ScriptedPch.cpp
rename : src/server/game/ScriptedPch.h => src/server/game/ScriptMgr/ScriptedPch.h
rename : src/server/game/SkillDiscovery.cpp => src/server/game/Skills/SkillDiscovery.cpp
rename : src/server/game/SkillDiscovery.h => src/server/game/Skills/SkillDiscovery.h
rename : src/server/game/SkillExtraItems.cpp => src/server/game/Skills/SkillExtraItems.cpp
rename : src/server/game/SkillExtraItems.h => src/server/game/Skills/SkillExtraItems.h
rename : src/server/game/SkillHandler.cpp => src/server/game/Skills/SkillHandler.cpp
rename : src/server/game/SpellAuraDefines.h => src/server/game/Spells/Auras/SpellAuraDefines.h
rename : src/server/game/SpellAuraEffects.cpp => src/server/game/Spells/Auras/SpellAuraEffects.cpp
rename : src/server/game/SpellAuraEffects.h => src/server/game/Spells/Auras/SpellAuraEffects.h
rename : src/server/game/SpellAuras.cpp => src/server/game/Spells/Auras/SpellAuras.cpp
rename : src/server/game/SpellAuras.h => src/server/game/Spells/Auras/SpellAuras.h
rename : src/server/game/SpellEffects.cpp => src/server/game/Spells/Auras/SpellEffects.cpp
rename : src/server/game/Spell.cpp => src/server/game/Spells/Spell.cpp
rename : src/server/game/Spell.h => src/server/game/Spells/Spell.h
rename : src/server/game/SpellHandler.cpp => src/server/game/Spells/SpellHandler.cpp
rename : src/server/game/SpellMgr.cpp => src/server/game/Spells/SpellMgr.cpp
rename : src/server/game/SpellMgr.h => src/server/game/Spells/SpellMgr.h
rename : src/server/game/PlayerDump.cpp => src/server/game/Tools/PlayerDump.cpp
rename : src/server/game/PlayerDump.h => src/server/game/Tools/PlayerDump.h
rename : src/server/game/Tools.cpp => src/server/game/Tools/Tools.cpp
rename : src/server/game/Tools.h => src/server/game/Tools/Tools.h
rename : src/server/game/Weather.cpp => src/server/game/Weather/Weather.cpp
rename : src/server/game/Weather.h => src/server/game/Weather/Weather.h
rename : src/server/game/TimeMgr.cpp => src/server/game/World/TimeMgr.cpp
rename : src/server/game/TimeMgr.h => src/server/game/World/TimeMgr.h
rename : src/server/game/World.cpp => src/server/game/World/World.cpp
rename : src/server/game/World.h => src/server/game/World/World.h
rename : src/server/game/WorldLog.cpp => src/server/game/World/WorldLog.cpp
rename : src/server/game/WorldLog.h => src/server/game/World/WorldLog.h
rename : src/server/game/WorldSession.cpp => src/server/game/World/WorldSession.cpp
rename : src/server/game/WorldSession.h => src/server/game/World/WorldSession.h
rename : src/server/game/WorldSocket.cpp => src/server/game/World/WorldSocket.cpp
rename : src/server/game/WorldSocket.h => src/server/game/World/WorldSocket.h
rename : src/server/game/WorldSocketMgr.cpp => src/server/game/World/WorldSocketMgr.cpp
rename : src/server/game/WorldSocketMgr.h => src/server/game/World/WorldSocketMgr.h

1 files changed, 631 insertions, 0 deletions

diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
new file mode 100644
index 00000000000..8ebcbce50c8
--- /dev/null
+++ b/src/server/game/Tools/PlayerDump.cpp
@@ -0,0 +1,631 @@
+/*
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
+ *
+ * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; 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 "PlayerDump.h"
+#include "Database/DatabaseEnv.h"
+#include "Database/SQLStorage.h"
+#include "UpdateFields.h"
+#include "ObjectMgr.h"
+
+#define DUMP_TABLE_COUNT 26
+struct DumpTable
+{
+    char const* name;
+    DumpTableType type;
+};
+
+static DumpTable dumpTables[DUMP_TABLE_COUNT] =
+{
+    { "characters",                       DTT_CHARACTER  },
+    { "character_account_data",           DTT_CHAR_TABLE },
+    { "character_achievement",            DTT_CHAR_TABLE },
+    { "character_achievement_progress",   DTT_CHAR_TABLE },
+    { "character_action",                 DTT_CHAR_TABLE },
+    { "character_aura",                   DTT_CHAR_TABLE },
+    { "character_declinedname",           DTT_CHAR_TABLE },
+    { "character_equipmentsets",          DTT_EQSET_TABLE},
+    { "character_gifts",                  DTT_ITEM_GIFT  },
+    { "character_glyphs",                 DTT_CHAR_TABLE },
+    { "character_homebind",               DTT_CHAR_TABLE },
+    { "character_inventory",              DTT_INVENTORY  },
+    { "character_pet",                    DTT_PET        },
+    { "character_pet_declinedname",       DTT_PET        },
+    { "character_queststatus",            DTT_CHAR_TABLE },
+    { "character_reputation",             DTT_CHAR_TABLE },
+    { "character_skills",                 DTT_CHAR_TABLE },
+    { "character_spell",                  DTT_CHAR_TABLE },
+    { "character_spell_cooldown",         DTT_CHAR_TABLE },
+    { "character_talent",                 DTT_CHAR_TABLE },
+    { "item_instance",                    DTT_ITEM       },
+    { "mail",                             DTT_MAIL       },
+    { "mail_items",                       DTT_MAIL_ITEM  },
+    { "pet_aura",                         DTT_PET_TABLE  },
+    { "pet_spell",                        DTT_PET_TABLE  },
+    { "pet_spell_cooldown",               DTT_PET_TABLE  },
+};
+
+// Low level functions
+static bool findtoknth(std::string &str, int n, std::string::size_type &s, std::string::size_type &e)
+{
+    int i; s = e = 0;
+    std::string::size_type size = str.size();
+    for (i = 1; s < size && i < n; s++) if (str[s] == ' ') ++i;
+    if (i < n)
+        return false;
+
+    e = str.find(' ', s);
+
+    return e != std::string::npos;
+}
+
+std::string gettoknth(std::string &str, int n)
+{
+    std::string::size_type s = 0, e = 0;
+    if (!findtoknth(str, n, s, e))
+        return "";
+
+    return str.substr(s, e-s);
+}
+
+bool findnth(std::string &str, int n, std::string::size_type &s, std::string::size_type &e)
+{
+    s = str.find("VALUES ('")+9;
+    if (s == std::string::npos) return false;
+
+    do
+    {
+        e = str.find("'",s);
+        if (e == std::string::npos) return false;
+    } while (str[e-1] == '\\');
+
+    for (int i = 1; i < n; ++i)
+    {
+        do
+        {
+            s = e+4;
+            e = str.find("'",s);
+            if (e == std::string::npos) return false;
+        } while (str[e-1] == '\\');
+    }
+    return true;
+}
+
+std::string gettablename(std::string &str)
+{
+    std::string::size_type s = 13;
+    std::string::size_type e = str.find(_TABLE_SIM_, s);
+    if (e == std::string::npos)
+        return "";
+
+    return str.substr(s, e-s);
+}
+
+bool changenth(std::string &str, int n, const char *with, bool insert = false, bool nonzero = false)
+{
+    std::string::size_type s, e;
+    if (!findnth(str,n,s,e))
+        return false;
+
+    if (nonzero && str.substr(s,e-s) == "0")
+        return true;                                        // not an error
+    if (!insert)
+        str.replace(s,e-s, with);
+    else
+        str.insert(s, with);
+
+    return true;
+}
+
+std::string getnth(std::string &str, int n)
+{
+    std::string::size_type s, e;
+    if (!findnth(str,n,s,e))
+        return "";
+
+    return str.substr(s, e-s);
+}
+
+bool changetoknth(std::string &str, int n, const char *with, bool insert = false, bool nonzero = false)
+{
+    std::string::size_type s = 0, e = 0;
+    if (!findtoknth(str, n, s, e))
+        return false;
+    if (nonzero && str.substr(s,e-s) == "0")
+        return true;                                        // not an error
+    if (!insert)
+        str.replace(s, e-s, with);
+    else
+        str.insert(s, with);
+
+    return true;
+}
+
+uint32 registerNewGuid(uint32 oldGuid, std::map<uint32, uint32> &guidMap, uint32 hiGuid)
+{
+    std::map<uint32, uint32>::const_iterator itr = guidMap.find(oldGuid);
+    if (itr != guidMap.end())
+        return itr->second;
+
+    uint32 newguid = hiGuid + guidMap.size();
+    guidMap[oldGuid] = newguid;
+    return newguid;
+}
+
+bool changeGuid(std::string &str, int n, std::map<uint32, uint32> &guidMap, uint32 hiGuid, bool nonzero = false)
+{
+    char chritem[20];
+    uint32 oldGuid = atoi(getnth(str, n).c_str());
+    if (nonzero && oldGuid == 0)
+        return true;                                        // not an error
+
+    uint32 newGuid = registerNewGuid(oldGuid, guidMap, hiGuid);
+    snprintf(chritem, 20, "%d", newGuid);
+
+    return changenth(str, n, chritem, false, nonzero);
+}
+
+bool changetokGuid(std::string &str, int n, std::map<uint32, uint32> &guidMap, uint32 hiGuid, bool nonzero = false)
+{
+    char chritem[20];
+    uint32 oldGuid = atoi(gettoknth(str, n).c_str());
+    if (nonzero && oldGuid == 0)
+        return true;                                        // not an error
+
+    uint32 newGuid = registerNewGuid(oldGuid, guidMap, hiGuid);
+    snprintf(chritem, 20, "%d", newGuid);
+
+    return changetoknth(str, n, chritem, false, nonzero);
+}
+
+std::string CreateDumpString(char const* tableName, QueryResult_AutoPtr result)
+{
+    if (!tableName || !result) return "";
+    std::ostringstream ss;
+    ss << "INSERT INTO "<< _TABLE_SIM_ << tableName << _TABLE_SIM_ << " VALUES (";
+    Field *fields = result->Fetch();
+    for (uint32 i = 0; i < result->GetFieldCount(); ++i)
+    {
+        if (i == 0) ss << "'";
+        else ss << ", '";
+
+        std::string s = fields[i].GetCppString();
+        CharacterDatabase.escape_string(s);
+        ss << s;
+
+        ss << "'";
+    }
+    ss << ");";
+    return ss.str();
+}
+
+std::string PlayerDumpWriter::GenerateWhereStr(char const* field, uint32 guid)
+{
+    std::ostringstream wherestr;
+    wherestr << field << " = '" << guid << "'";
+    return wherestr.str();
+}
+
+std::string PlayerDumpWriter::GenerateWhereStr(char const* field, GUIDs const& guids, GUIDs::const_iterator& itr)
+{
+    std::ostringstream wherestr;
+    wherestr << field << " IN ('";
+    for (; itr != guids.end(); ++itr)
+    {
+        wherestr << *itr;
+
+        if (wherestr.str().size() > MAX_QUERY_LEN - 50)      // near to max query
+        {
+            ++itr;
+            break;
+        }
+
+        GUIDs::const_iterator itr2 = itr;
+        if (++itr2 != guids.end())
+            wherestr << "','";
+    }
+    wherestr << "')";
+    return wherestr.str();
+}
+
+void StoreGUID(QueryResult_AutoPtr result,uint32 field,std::set<uint32>& guids)
+{
+    Field* fields = result->Fetch();
+    uint32 guid = fields[field].GetUInt32();
+    if (guid)
+        guids.insert(guid);
+}
+
+void StoreGUID(QueryResult_AutoPtr result,uint32 data,uint32 field, std::set<uint32>& guids)
+{
+    Field* fields = result->Fetch();
+    std::string dataStr = fields[data].GetCppString();
+    uint32 guid = atoi(gettoknth(dataStr, field).c_str());
+    if (guid)
+        guids.insert(guid);
+}
+
+// Writing - High-level functions
+void PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tableFrom, char const*tableTo, DumpTableType type)
+{
+    GUIDs const* guids = NULL;
+    char const* fieldname = NULL;
+
+    switch (type)
+    {
+        case DTT_ITEM:      fieldname = "guid";      guids = &items; break;
+        case DTT_ITEM_GIFT: fieldname = "item_guid"; guids = &items; break;
+        case DTT_PET:       fieldname = "owner";                     break;
+        case DTT_PET_TABLE: fieldname = "guid";      guids = &pets;  break;
+        case DTT_MAIL:      fieldname = "receiver";                  break;
+        case DTT_MAIL_ITEM: fieldname = "mail_id";   guids = &mails; break;
+        default:            fieldname = "guid";                      break;
+    }
+
+    // for guid set stop if set is empty
+    if (guids && guids->empty())
+        return;                                             // nothing to do
+
+    // setup for guids case start position
+    GUIDs::const_iterator guids_itr;
+    if (guids)
+        guids_itr = guids->begin();
+
+    do
+    {
+        std::string wherestr;
+
+        if (guids)                                           // set case, get next guids string
+            wherestr = GenerateWhereStr(fieldname,*guids,guids_itr);
+        else                                                // not set case, get single guid string
+            wherestr = GenerateWhereStr(fieldname,guid);
+
+        QueryResult_AutoPtr result = CharacterDatabase.PQuery("SELECT * FROM %s WHERE %s", tableFrom, wherestr.c_str());
+        if (!result)
+            return;
+
+        do
+        {
+            // collect guids
+            switch (type)
+            {
+                case DTT_INVENTORY:
+                    StoreGUID(result,3,items); break;       // item guid collection (character_inventory.item)
+                case DTT_PET:
+                    StoreGUID(result,0,pets);  break;       // pet petnumber collection (character_pet.id)
+                case DTT_MAIL:
+                    StoreGUID(result,0,mails);              // mail id collection (mail.id)
+                case DTT_MAIL_ITEM:
+                    StoreGUID(result,1,items); break;       // item guid collection (mail_items.item_guid)
+                default:                       break;
+            }
+
+            dump += CreateDumpString(tableTo, result);
+            dump += "\n";
+        }
+        while (result->NextRow());
+    }
+    while (guids && guids_itr != guids->end());              // not set case iterate single time, set case iterate for all guids
+}
+
+std::string PlayerDumpWriter::GetDump(uint32 guid)
+{
+    std::string dump;
+
+    dump += "IMPORTANT NOTE: THIS DUMPFILE IS MADE FOR USE WITH THE 'PDUMP' COMMAND ONLY - EITHER THROUGH INGAME CHAT OR ON CONSOLE!\n";
+    dump += "IMPORTANT NOTE: DO NOT apply it directly - it will irreversibly DAMAGE and CORRUPT your database! You have been warned!\n\n";
+
+    for (int i = 0; i < DUMP_TABLE_COUNT; ++i)
+        DumpTable(dump, guid, dumpTables[i].name, dumpTables[i].name, dumpTables[i].type);
+
+    // TODO: Add instance/group..
+    // TODO: Add a dump level option to skip some non-important tables
+
+    return dump;
+}
+
+DumpReturn PlayerDumpWriter::WriteDump(const std::string& file, uint32 guid)
+{
+    FILE *fout = fopen(file.c_str(), "w");
+    if (!fout)
+        return DUMP_FILE_OPEN_ERROR;
+
+    std::string dump = GetDump(guid);
+
+    fprintf(fout,"%s\n",dump.c_str());
+    fclose(fout);
+    return DUMP_SUCCESS;
+}
+
+// Reading - High-level functions
+#define ROLLBACK(DR) {CharacterDatabase.RollbackTransaction(); fclose(fin); return (DR);}
+
+DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, std::string name, uint32 guid)
+{
+    // check character count
+    {
+        QueryResult_AutoPtr result = CharacterDatabase.PQuery("SELECT COUNT(guid) FROM characters WHERE account = '%d'", account);
+        uint8 charcount = 0;
+        if (result)
+        {
+            Field *fields=result->Fetch();
+            charcount = fields[0].GetUInt8();
+
+            if (charcount >= 10)
+                return DUMP_TOO_MANY_CHARS;
+        }
+    }
+
+    FILE *fin = fopen(file.c_str(), "r");
+    if (!fin)
+        return DUMP_FILE_OPEN_ERROR;
+
+    QueryResult_AutoPtr result = QueryResult_AutoPtr(NULL);
+    char newguid[20], chraccount[20], newpetid[20], currpetid[20], lastpetid[20];
+
+    // make sure the same guid doesn't already exist and is safe to use
+    bool incHighest = true;
+    if (guid != 0 && guid < objmgr.m_hiCharGuid)
+    {
+        result = CharacterDatabase.PQuery("SELECT 1 FROM characters WHERE guid = '%d'", guid);
+        if (result)
+            guid = objmgr.m_hiCharGuid;                     // use first free if exists
+        else incHighest = false;
+    }
+    else
+        guid = objmgr.m_hiCharGuid;
+
+    // normalize the name if specified and check if it exists
+    if (!normalizePlayerName(name))
+        name = "";
+
+    if (ObjectMgr::CheckPlayerName(name,true) == CHAR_NAME_SUCCESS)
+    {
+        CharacterDatabase.escape_string(name);              // for safe, we use name only for sql quearies anyway
+        result = CharacterDatabase.PQuery("SELECT 1 FROM characters WHERE name = '%s'", name.c_str());
+        if (result)
+            name = "";                                      // use the one from the dump
+    }
+    else
+        name = "";
+
+    // name encoded or empty
+
+    snprintf(newguid, 20, "%d", guid);
+    snprintf(chraccount, 20, "%d", account);
+    snprintf(newpetid, 20, "%d", objmgr.GeneratePetNumber());
+    snprintf(lastpetid, 20, "%s", "");
+
+    std::map<uint32,uint32> items;
+    std::map<uint32,uint32> mails;
+    char buf[32000] = "";
+
+    typedef std::map<uint32, uint32> PetIds;                // old->new petid relation
+    typedef PetIds::value_type PetIdsPair;
+    PetIds petids;
+
+    CharacterDatabase.BeginTransaction();
+    while (!feof(fin))
+    {
+        if (!fgets(buf, 32000, fin))
+        {
+            if (feof(fin)) break;
+            ROLLBACK(DUMP_FILE_BROKEN);
+        }
+
+        std::string line; line.assign(buf);
+
+        // skip empty strings
+        size_t nw_pos = line.find_first_not_of(" \t\n\r\7");
+        if (nw_pos == std::string::npos)
+            continue;
+
+        // skip logfile-side dump start notice, the important notes and dump end notices
+        if ((line.substr(nw_pos,16) == "== START DUMP ==") ||
+            (line.substr(nw_pos,15) == "IMPORTANT NOTE:") ||
+            (line.substr(nw_pos,14) == "== END DUMP =="))
+            continue;
+
+        // add required_ check
+        /*
+        if (line.substr(nw_pos,41) == "UPDATE character_db_version SET required_")
+        {
+            if (!CharacterDatabase.Execute(line.c_str()))
+                ROLLBACK(DUMP_FILE_BROKEN);
+
+            continue;
+        }
+        */
+
+        // determine table name and load type
+        std::string tn = gettablename(line);
+        if (tn.empty())
+        {
+            sLog.outError("LoadPlayerDump: Can't extract table name from line: '%s'!", line.c_str());
+            ROLLBACK(DUMP_FILE_BROKEN);
+        }
+
+        DumpTableType type;
+        uint8 i;
+        for (i = 0; i < DUMP_TABLE_COUNT; ++i)
+        {
+            if (tn == dumpTables[i].name)
+            {
+                type = dumpTables[i].type;
+                break;
+            }
+        }
+
+        if (i == DUMP_TABLE_COUNT)
+        {
+            sLog.outError("LoadPlayerDump: Unknown table: '%s'!", tn.c_str());
+            ROLLBACK(DUMP_FILE_BROKEN);
+        }
+
+        // change the data to server values
+        switch(type)
+        {
+            case DTT_CHAR_TABLE:
+                if (!changenth(line, 1, newguid))           // character_*.guid update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+                break;
+
+            case DTT_CHARACTER:
+            {
+                if (!changenth(line, 1, newguid))           // characters.guid update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+
+                if (!changenth(line, 2, chraccount))        // characters.account update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+
+                if (name == "")
+                {
+                    // check if the original name already exists
+                    name = getnth(line, 3);
+                    CharacterDatabase.escape_string(name);
+
+                    result = CharacterDatabase.PQuery("SELECT 1 FROM characters WHERE name = '%s'", name.c_str());
+                    if (result)
+                    {
+                        if (!changenth(line, 36, "1"))       // characters.at_login set to "rename on login"
+                            ROLLBACK(DUMP_FILE_BROKEN);
+                    }
+                }
+                else if (!changenth(line, 3, name.c_str())) // characters.name
+                    ROLLBACK(DUMP_FILE_BROKEN);
+
+                break;
+            }
+            case DTT_INVENTORY:
+            {
+                if (!changenth(line, 1, newguid))           // character_inventory.guid update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+
+                if (!changeGuid(line, 2, items, objmgr.m_hiItemGuid, true))
+                    ROLLBACK(DUMP_FILE_BROKEN);             // character_inventory.bag update
+                if (!changeGuid(line, 4, items, objmgr.m_hiItemGuid))
+                    ROLLBACK(DUMP_FILE_BROKEN);             // character_inventory.item update
+                break;
+            }
+            case DTT_ITEM:
+            {
+                // item, owner, data field:item, owner guid
+                if (!changeGuid(line, 1, items, objmgr.m_hiItemGuid))
+                   ROLLBACK(DUMP_FILE_BROKEN);              // item_instance.guid update
+                if (!changenth(line, 2, newguid))           // item_instance.owner_guid update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+                std::string vals = getnth(line,3);          // item_instance.data get
+                if (!changetokGuid(vals, OBJECT_FIELD_GUID+1, items, objmgr.m_hiItemGuid))
+                    ROLLBACK(DUMP_FILE_BROKEN);             // item_instance.data.OBJECT_FIELD_GUID update
+                if (!changetoknth(vals, ITEM_FIELD_OWNER+1, newguid))
+                    ROLLBACK(DUMP_FILE_BROKEN);             // item_instance.data.ITEM_FIELD_OWNER update
+                if (!changenth(line, 3, vals.c_str()))      // item_instance.data update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+                break;
+            }
+            case DTT_ITEM_GIFT:
+            {
+                if (!changenth(line, 1, newguid))           // character_gifts.guid update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+                if (!changeGuid(line, 2, items, objmgr.m_hiItemGuid))
+                    ROLLBACK(DUMP_FILE_BROKEN);             // character_gifts.item_guid update
+                break;
+            }
+            case DTT_PET:
+            {
+                //store a map of old pet id to new inserted pet id for use by type 5 tables
+                snprintf(currpetid, 20, "%s", getnth(line, 1).c_str());
+                if (strlen(lastpetid) == 0) snprintf(lastpetid, 20, "%s", currpetid);
+                if (strcmp(lastpetid,currpetid) != 0)
+                {
+                    snprintf(newpetid, 20, "%d", objmgr.GeneratePetNumber());
+                    snprintf(lastpetid, 20, "%s", currpetid);
+                }
+
+                std::map<uint32, uint32> :: const_iterator petids_iter = petids.find(atoi(currpetid));
+
+                if (petids_iter == petids.end())
+                {
+                    petids.insert(PetIdsPair(atoi(currpetid), atoi(newpetid)));
+                }
+
+                if (!changenth(line, 1, newpetid))          // character_pet.id update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+                if (!changenth(line, 3, newguid))           // character_pet.owner update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+
+                break;
+            }
+            case DTT_PET_TABLE:                             // pet_aura, pet_spell, pet_spell_cooldown
+            {
+                snprintf(currpetid, 20, "%s", getnth(line, 1).c_str());
+
+                // lookup currpetid and match to new inserted pet id
+                std::map<uint32, uint32> :: const_iterator petids_iter = petids.find(atoi(currpetid));
+                if (petids_iter == petids.end())             // couldn't find new inserted id
+                    ROLLBACK(DUMP_FILE_BROKEN);
+
+                snprintf(newpetid, 20, "%d", petids_iter->second);
+
+                if (!changenth(line, 1, newpetid))
+                    ROLLBACK(DUMP_FILE_BROKEN);
+
+                break;
+            }
+            case DTT_MAIL:                                  // mail
+            {
+                if (!changeGuid(line, 1, mails, objmgr.m_mailid))
+                    ROLLBACK(DUMP_FILE_BROKEN);             // mail.id update
+                if (!changenth(line, 6, newguid))           // mail.receiver update
+                    ROLLBACK(DUMP_FILE_BROKEN);
+                break;
+            }
+            case DTT_MAIL_ITEM:                             // mail_items
+            {
+                if (!changeGuid(line, 1, mails, objmgr.m_mailid))
+                    ROLLBACK(DUMP_FILE_BROKEN);             // mail_items.id
+                if (!changeGuid(line, 2, items, objmgr.m_hiItemGuid))
+                    ROLLBACK(DUMP_FILE_BROKEN);             // mail_items.item_guid
+                if (!changenth(line, 4, newguid))           // mail_items.receiver
+                    ROLLBACK(DUMP_FILE_BROKEN);
+                break;
+            }
+            default:
+                sLog.outError("Unknown dump table type: %u",type);
+                break;
+        }
+
+        if (!CharacterDatabase.Execute(line.c_str()))
+            ROLLBACK(DUMP_FILE_BROKEN);
+    }
+
+    CharacterDatabase.CommitTransaction();
+
+    objmgr.m_hiItemGuid += items.size();
+    objmgr.m_mailid     += mails.size();
+
+    if (incHighest)
+        ++objmgr.m_hiCharGuid;
+
+    fclose(fin);
+
+    return DUMP_SUCCESS;
+}
+