araxiaonline/TrinityCore2
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore2.git synced 2026-06-18 05:49:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wintergrasp_cleanup

Browse Source 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/World/World.h
	src/server/shared/Logging/Log.h
This commit is contained in:
Kandera
2012-02-21 11:00:32 -05:00
parent d9e9a1b404 2f37e82097
commit 277aed85cf
182 changed files with 24302 additions and 4103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/GameObject/GameObject.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
#include "GameObjectModel.h"
#include "DynamicTree.h"
GameObject::GameObject() : WorldObject(false), m_goValue(new GameObjectValue), m_AI(NULL), m_model(NULL)
GameObject::GameObject() : WorldObject(false), m_model(NULL), m_goValue(new GameObjectValue), m_AI(NULL)
{
m_objectType |= TYPEMASK_GAMEOBJECT;
m_objectTypeId = TYPEID_GAMEOBJECT;