aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-21 22:31:00 -0600
committermegamage <none@none>2009-03-21 22:31:00 -0600
commita0298bc58d414fc30dddbf2dc7b441bff6c35161 (patch)
tree23a5f068ffcb0f93a3614349b0a4c07cc7ee3027
parentee332629b6af6b12079497f5d635e15fedee87b2 (diff)
parentf5116e0e7864d593930d1404d5b4d9316553ee42 (diff)
*Merge.
--HG-- branch : trunk
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/game/BattleGround.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb40c5bc262..57ed5684f5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,7 @@ ADD_CUSTOM_TARGET("revision.h" ALL
COMMAND "${Trinity_BINARY_DIR}/genrev"
${Trinity_SOURCE_DIR}
WORKING_DIRECTORY "${Trinity_SOURCE_DIR}/src/shared"
+ DEPENDS genrev
)
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 78d0024c73a..afbc5de607a 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -1488,6 +1488,7 @@ Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, f
return NULL;
}
+ pCreature->SetHomePosition(x, y, z, o);
pCreature->AIM_Initialize();
//pCreature->SetDungeonDifficulty(0);