aboutsummaryrefslogtreecommitdiff
path: root/src/game/WorldSocket.cpp
diff options
context:
space:
mode:
authorKingPin <none@none>2008-11-02 16:53:46 -0600
committerKingPin <none@none>2008-11-02 16:53:46 -0600
commitd5beb2bbe97afa0e50df8a2cef49bcac4a607f4a (patch)
tree4ce9fec826220b2476406e38915a15b6d00a4ce1 /src/game/WorldSocket.cpp
parent6633d3c680d4f75d743f705e9b26278674f11ee0 (diff)
[svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT
* Default behaviour of pets for creatures changed to REACT_DEFENSIVE * Disallowed sending wrapped items as COD * Prevent loading and saving single target auras for pet in same way as already implemented for player * Correctly limit use some flask types to zones. * Fixed extracting common.MPQ under *nix * Many small xleanups and fixes. ** mangos merge rev. TEST REV so be careful of creepy crawly bugs! --HG-- branch : trunk
Diffstat (limited to 'src/game/WorldSocket.cpp')
-rw-r--r--src/game/WorldSocket.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index 34dea1d9d30..bf9dd0aefb4 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -18,9 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "Common.h"
-#include "WorldSocket.h"
-
#include <ace/Message_Block.h>
#include <ace/OS_NS_string.h>
#include <ace/OS_NS_unistd.h>
@@ -32,6 +29,9 @@
#include <ace/Reactor.h>
#include <ace/Auto_Ptr.h>
+#include "WorldSocket.h"
+#include "Common.h"
+
#include "Util.h"
#include "World.h"
#include "WorldPacket.h"