This commit is contained in:
TheLuda 2008-10-15 18:26:08 +02:00
parent 5d294f0ad2
commit adc46ef907
23 changed files with 335 additions and 337 deletions

View file

@ -28,243 +28,243 @@ noinst_LIBRARIES = libmangosgame.a
# libmangossgame library will later be reused by ... # libmangossgame library will later be reused by ...
libmangosgame_a_SOURCES = \ libmangosgame_a_SOURCES = \
AccountMgr.cpp \ AccountMgr.cpp \
AccountMgr.h \ AccountMgr.h \
AddonHandler.cpp \ AddonHandler.cpp \
AddonHandler.h \ AddonHandler.h \
AggressorAI.cpp \ AggressorAI.cpp \
AggressorAI.h \ AggressorAI.h \
AnimalRandomMovementGenerator.h \ AnimalRandomMovementGenerator.h \
ArenaTeam.cpp \ ArenaTeam.cpp \
ArenaTeam.h \ ArenaTeam.h \
ArenaTeamHandler.cpp \ ArenaTeamHandler.cpp \
AuctionHouse.cpp \ AuctionHouse.cpp \
AuctionHouseObject.h \ AuctionHouseObject.h \
Bag.cpp \ Bag.cpp \
Bag.h \ Bag.h \
BattleGround.cpp \ BattleGround.cpp \
BattleGroundAA.cpp \ BattleGroundAA.cpp \
BattleGroundAB.cpp \ BattleGroundAB.cpp \
BattleGroundAV.cpp \ BattleGroundAV.cpp \
BattleGroundBE.cpp \ BattleGroundBE.cpp \
BattleGroundEY.cpp \ BattleGroundEY.cpp \
BattleGroundNA.cpp \ BattleGroundNA.cpp \
BattleGroundRL.cpp \ BattleGroundRL.cpp \
BattleGroundWS.cpp \ BattleGroundWS.cpp \
BattleGround.h \ BattleGround.h \
BattleGroundAA.h \ BattleGroundAA.h \
BattleGroundAB.h \ BattleGroundAB.h \
BattleGroundAV.h \ BattleGroundAV.h \
BattleGroundBE.h \ BattleGroundBE.h \
BattleGroundEY.h \ BattleGroundEY.h \
BattleGroundNA.h \ BattleGroundNA.h \
BattleGroundRL.h \ BattleGroundRL.h \
BattleGroundWS.h \ BattleGroundWS.h \
BattleGroundHandler.cpp \ BattleGroundHandler.cpp \
BattleGroundMgr.cpp \ BattleGroundMgr.cpp \
BattleGroundMgr.h \ BattleGroundMgr.h \
Cell.h \ Cell.h \
CellImpl.h \ CellImpl.h \
Channel.cpp \ Channel.cpp \
Channel.h \ Channel.h \
ChannelHandler.cpp \ ChannelHandler.cpp \
ChannelMgr.h \ ChannelMgr.h \
CharacterHandler.cpp \ CharacterHandler.cpp \
Chat.cpp \ Chat.cpp \
Chat.h \ Chat.h \
ChatHandler.cpp \ ChatHandler.cpp \
CombatHandler.cpp \ CombatHandler.cpp \
ConfusedMovementGenerator.cpp \ ConfusedMovementGenerator.cpp \
ConfusedMovementGenerator.h \ ConfusedMovementGenerator.h \
Corpse.cpp \ Corpse.cpp \
Corpse.h \ Corpse.h \
CreatureAI.cpp \ CreatureAI.cpp \
CreatureAI.h \ CreatureAI.h \
CreatureAIImpl.h \ CreatureAIImpl.h \
CreatureAIRegistry.cpp \ CreatureAIRegistry.cpp \
CreatureAIRegistry.h \ CreatureAIRegistry.h \
CreatureAISelector.cpp \ CreatureAISelector.cpp \
CreatureAISelector.h \ CreatureAISelector.h \
Creature.cpp \ Creature.cpp \
Creature.h \ Creature.h \
debugcmds.cpp \ debugcmds.cpp \
DestinationHolder.cpp \ DestinationHolder.cpp \
DestinationHolder.h \ DestinationHolder.h \
DestinationHolderImp.h \ DestinationHolderImp.h \
DuelHandler.cpp \ DuelHandler.cpp \
DynamicObject.cpp \ DynamicObject.cpp \
DynamicObject.h \ DynamicObject.h \
FleeingMovementGenerator.cpp \ FleeingMovementGenerator.cpp \
FleeingMovementGenerator.h \ FleeingMovementGenerator.h \
Formulas.h \ Formulas.h \
GameEvent.cpp \ GameEvent.cpp \
GameEvent.h \ GameEvent.h \
GameObject.cpp \ GameObject.cpp \
GameObject.h \ GameObject.h \
GlobalEvents.cpp \ GlobalEvents.cpp \
GlobalEvents.h \ GlobalEvents.h \
GossipDef.cpp \ GossipDef.cpp \
GossipDef.h \ GossipDef.h \
GridDefines.h \ GridDefines.h \
GridNotifiers.cpp \ GridNotifiers.cpp \
GridNotifiers.h \ GridNotifiers.h \
GridNotifiersImpl.h \ GridNotifiersImpl.h \
GridStates.cpp \ GridStates.cpp \
GridStates.h \ GridStates.h \
Group.cpp \ Group.cpp \
Group.h \ Group.h \
GroupHandler.cpp \ GroupHandler.cpp \
GuardAI.cpp \ GuardAI.cpp \
GuardAI.h \ GuardAI.h \
Guild.cpp \ Guild.cpp \
Guild.h \ Guild.h \
GuildHandler.cpp \ GuildHandler.cpp \
HateMatrix.h \ HateMatrix.h \
HomeMovementGenerator.cpp \ HomeMovementGenerator.cpp \
HomeMovementGenerator.h \ HomeMovementGenerator.h \
HostilRefManager.cpp \ HostilRefManager.cpp \
HostilRefManager.h \ HostilRefManager.h \
IdleMovementGenerator.cpp \ IdleMovementGenerator.cpp \
IdleMovementGenerator.h \ IdleMovementGenerator.h \
InstanceData.cpp \ InstanceData.cpp \
InstanceData.h \ InstanceData.h \
InstanceSaveMgr.cpp \ InstanceSaveMgr.cpp \
InstanceSaveMgr.h \ InstanceSaveMgr.h \
Item.cpp \ Item.cpp \
Item.h \ Item.h \
ItemEnchantmentMgr.cpp \ ItemEnchantmentMgr.cpp \
ItemEnchantmentMgr.h \ ItemEnchantmentMgr.h \
ItemHandler.cpp \ ItemHandler.cpp \
ItemPrototype.h \ ItemPrototype.h \
Language.h \ Language.h \
Level0.cpp \ Level0.cpp \
Level1.cpp \ Level1.cpp \
Level2.cpp \ Level2.cpp \
Level3.cpp \ Level3.cpp \
LFGHandler.cpp \ LFGHandler.cpp \
LootHandler.cpp \ LootHandler.cpp \
LootMgr.cpp \ LootMgr.cpp \
LootMgr.h \ LootMgr.h \
Mail.cpp \ Mail.cpp \
Mail.h \ Mail.h \
Map.cpp \ Map.cpp \
Map.h \ Map.h \
MapInstanced.cpp \ MapInstanced.cpp \
MapInstanced.h \ MapInstanced.h \
MapManager.cpp \ MapManager.cpp \
MapManager.h \ MapManager.h \
MiscHandler.cpp \ MiscHandler.cpp \
MotionMaster.cpp \ MotionMaster.cpp \
MotionMaster.h \ MotionMaster.h \
MovementGenerator.cpp \ MovementGenerator.cpp \
MovementGenerator.h \ MovementGenerator.h \
MovementGeneratorImpl.h \ MovementGeneratorImpl.h \
MovementHandler.cpp \ MovementHandler.cpp \
NPCHandler.cpp \ NPCHandler.cpp \
NPCHandler.h \ NPCHandler.h \
NullCreatureAI.cpp \ NullCreatureAI.cpp \
NullCreatureAI.h \ NullCreatureAI.h \
ObjectAccessor.cpp \ ObjectAccessor.cpp \
ObjectAccessor.h \ ObjectAccessor.h \
Object.cpp \ Object.cpp \
ObjectDefines.h \ ObjectDefines.h \
ObjectGridLoader.cpp \ ObjectGridLoader.cpp \
ObjectGridLoader.h \ ObjectGridLoader.h \
Object.h \ Object.h \
ObjectMgr.cpp \ ObjectMgr.cpp \
ObjectMgr.h \ ObjectMgr.h \
ObjectPosSelector.cpp \ ObjectPosSelector.cpp \
ObjectPosSelector.h \ ObjectPosSelector.h \
Opcodes.cpp \ Opcodes.cpp \
Opcodes.h \ Opcodes.h \
Path.h \ Path.h \
PetAI.cpp \ PetAI.cpp \
PetAI.h \ PetAI.h \
Pet.cpp \ Pet.cpp \
Pet.h \ Pet.h \
PetHandler.cpp \ PetHandler.cpp \
PetitionsHandler.cpp \ PetitionsHandler.cpp \
Player.cpp \ Player.cpp \
Player.h \ Player.h \
PlayerDump.cpp \ PlayerDump.cpp \
PlayerDump.h \ PlayerDump.h \
PointMovementGenerator.cpp \ PointMovementGenerator.cpp \
PointMovementGenerator.h \ PointMovementGenerator.h \
QueryHandler.cpp \ QueryHandler.cpp \
QuestDef.cpp \ QuestDef.cpp \
QuestDef.h \ QuestDef.h \
QuestHandler.cpp \ QuestHandler.cpp \
RandomMovementGenerator.cpp \ RandomMovementGenerator.cpp \
RandomMovementGenerator.h \ RandomMovementGenerator.h \
ReactorAI.cpp \ ReactorAI.cpp \
ReactorAI.h \ ReactorAI.h \
ScriptCalls.cpp \ ScriptCalls.cpp \
ScriptCalls.h \ ScriptCalls.h \
SharedDefines.h \ SharedDefines.h \
SkillHandler.cpp \ SkillHandler.cpp \
SpellAuraDefines.h \ SpellAuraDefines.h \
SpellAuras.cpp \ SpellAuras.cpp \
SpellAuras.h \ SpellAuras.h \
Spell.cpp \ Spell.cpp \
SpellEffects.cpp \ SpellEffects.cpp \
Spell.h \ Spell.h \
SkillDiscovery.cpp \ SkillDiscovery.cpp \
SkillDiscovery.h \ SkillDiscovery.h \
SkillExtraItems.cpp \ SkillExtraItems.cpp \
SkillExtraItems.h \ SkillExtraItems.h \
SpellHandler.cpp \ SpellHandler.cpp \
SocialMgr.cpp \ SocialMgr.cpp \
SocialMgr.h \ SocialMgr.h \
SpellMgr.cpp \ SpellMgr.cpp \
SpellMgr.h \ SpellMgr.h \
StatSystem.cpp \ StatSystem.cpp \
TargetedMovementGenerator.cpp \ TargetedMovementGenerator.cpp \
TargetedMovementGenerator.h \ TargetedMovementGenerator.h \
TaxiHandler.cpp \ TaxiHandler.cpp \
TemporarySummon.cpp \ TemporarySummon.cpp \
TemporarySummon.h \ TemporarySummon.h \
tools.cpp \ tools.cpp \
Tools.h \ Tools.h \
TotemAI.cpp \ TotemAI.cpp \
TotemAI.h \ TotemAI.h \
Totem.cpp \ Totem.cpp \
Totem.h \ Totem.h \
TradeHandler.cpp \ TradeHandler.cpp \
Transports.cpp \ Transports.cpp \
Transports.h \ Transports.h \
ThreatManager.cpp \ ThreatManager.cpp \
ThreatManager.h \ ThreatManager.h \
Traveller.h \ Traveller.h \
Unit.cpp \ Unit.cpp \
Unit.h \ Unit.h \
UnitEvents.h \ UnitEvents.h \
UpdateData.cpp \ UpdateData.cpp \
UpdateData.h \ UpdateData.h \
UpdateFields.h \ UpdateFields.h \
UpdateMask.h \ UpdateMask.h \
VoiceChatHandler.cpp \ VoiceChatHandler.cpp \
WaypointManager.cpp \ WaypointManager.cpp \
WaypointManager.h \ WaypointManager.h \
WaypointMovementGenerator.cpp \ WaypointMovementGenerator.cpp \
WaypointMovementGenerator.h \ WaypointMovementGenerator.h \
Weather.cpp \ Weather.cpp \
Weather.h \ Weather.h \
World.cpp \ World.cpp \
World.h \ World.h \
WorldLog.cpp \ WorldLog.cpp \
WorldLog.h \ WorldLog.h \
WorldSession.cpp \ WorldSession.cpp \
WorldSession.h \ WorldSession.h \
WorldSocket.cpp \ WorldSocket.cpp \
WorldSocket.h \ WorldSocket.h \
WorldSocketMgr.cpp \ WorldSocketMgr.cpp \
WorldSocketMgr.h \ WorldSocketMgr.h \
FollowerReference.cpp \ FollowerReference.cpp \
FollowerReference.h \ FollowerReference.h \
FollowerRefManager.h \ FollowerRefManager.h \
GroupReference.cpp \ GroupReference.cpp \
GroupReference.h \ GroupReference.h \
GroupRefManager.h GroupRefManager.h
## Link against shared library ## Link against shared library
libmangosgame_a_LIBADD = ../shared/libmangosshared.a ../shared/Auth/libmangosauth.a ../shared/Config/libmangosconfig.a ../shared/Database/libmangosdatabase.a ../shared/vmap/libmangosvmaps.a libmangosgame_a_LIBADD = ../shared/libmangosshared.a ../shared/Auth/libmangosauth.a ../shared/Config/libmangosconfig.a ../shared/Database/libmangosdatabase.a ../shared/vmap/libmangosvmaps.a

View file

@ -507,5 +507,3 @@ void WorldSession::SendAuthWaitQue(uint32 position)
SendPacket(&packet); SendPacket(&packet);
} }
} }

View file

@ -23,7 +23,7 @@
*/ */
#ifndef _WORLDSOCKET_H #ifndef _WORLDSOCKET_H
#define _WORLDSOCKET_H #define _WORLDSOCKET_H
#include <ace/Basic_Types.h> #include <ace/Basic_Types.h>
#include <ace/Synch_Traits.h> #include <ace/Synch_Traits.h>
@ -228,6 +228,6 @@ private:
uint32 m_Seed; uint32 m_Seed;
}; };
#endif /* _WORLDSOCKET_H */ #endif /* _WORLDSOCKET_H */
/// @} /// @}