diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-11 20:34:44 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-11 20:34:44 +0100 |
| commit | 07024d3ea84db832e5bdd221c293e5daf297181a (patch) | |
| tree | 663c0412bd112c0bef4f9b106c597e2bc0d05eb5 /src/server/scripts/Commands | |
| parent | 70445f34a6b66b603662716371c6f6a873a95855 (diff) | |
| parent | fb26e1852394a1aa6e7695030eabcf8e85b1c5c8 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/DataStores/DBCEnums.h
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_debug.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_wp.cpp | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 05b56e7b25d..63fe3e91433 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -924,7 +924,7 @@ public: if (!ve) return false; - Creature* v = new Creature; + Creature* v = new Creature(); Map* map = handler->GetSession()->GetPlayer()->GetMap(); diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 86d079f53e4..711e40b0659 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -693,8 +693,13 @@ public: wpCreature->AddObjectToRemoveList(); } // re-create +<<<<<<< HEAD Creature* wpCreature2 = new Creature; if (!wpCreature2->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), VISUAL_WAYPOINT, 0, 0, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation())) +======= + Creature* wpCreature2 = new Creature(); + if (!wpCreature2->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), VISUAL_WAYPOINT, 0, 0, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation())) +>>>>>>> fb26e1852394a1aa6e7695030eabcf8e85b1c5c8 { handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, VISUAL_WAYPOINT); delete wpCreature2; @@ -917,8 +922,13 @@ public: Map* map = chr->GetMap(); float o = chr->GetOrientation(); +<<<<<<< HEAD Creature* wpCreature = new Creature; if (!wpCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o)) +======= + Creature* wpCreature = new Creature(); + if (!wpCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o)) +>>>>>>> fb26e1852394a1aa6e7695030eabcf8e85b1c5c8 { handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id); delete wpCreature; @@ -981,8 +991,13 @@ public: float o = chr->GetOrientation(); Map* map = chr->GetMap(); +<<<<<<< HEAD Creature* creature = new Creature; if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o)) +======= + Creature* creature = new Creature(); + if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o)) +>>>>>>> fb26e1852394a1aa6e7695030eabcf8e85b1c5c8 { handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id); delete creature; @@ -1030,7 +1045,7 @@ public: Player* chr = handler->GetSession()->GetPlayer(); Map* map = chr->GetMap(); - Creature* creature = new Creature; + Creature* creature = new Creature(); if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o)) { handler->PSendSysMessage(LANG_WAYPOINT_NOTCREATED, id); |