josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Battlefield:

Browse Source 
* Fix correct faction for Wintergrasp
* Remove hack for vehicle faction
* Fix gameobject ai for go_wg_vehicle_teleporter
* Fix some warnings and code style
This commit is contained in:
Vincent-Michael
2012-08-24 20:25:18 +02:00
parent 6bcc994a5e
commit 2041ff2562
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
-2
View File
@@ -538,7 +538,6 @@ void BattlefieldWG::OnCreatureCreate(Creature* creature)
{ {
UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_H, 1); UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_H, 1);
creature->AddAura(SPELL_HORDE_FLAG, creature); creature->AddAura(SPELL_HORDE_FLAG, creature);
creature->setFaction(WintergraspFaction[team]);
m_vehicles[team].insert(creature->GetGUID()); m_vehicles[team].insert(creature->GetGUID());
UpdateVehicleCountWG(); UpdateVehicleCountWG();
} }
@@ -555,7 +554,6 @@ void BattlefieldWG::OnCreatureCreate(Creature* creature)
{ {
UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_A, 1); UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_A, 1);
creature->AddAura(SPELL_ALLIANCE_FLAG, creature); creature->AddAura(SPELL_ALLIANCE_FLAG, creature);
creature->setFaction(WintergraspFaction[team]);
m_vehicles[team].insert(creature->GetGUID()); m_vehicles[team].insert(creature->GetGUID());
UpdateVehicleCountWG(); UpdateVehicleCountWG();
} }
src/server/game/Battlefield/Zones/BattlefieldWG.h
+1 -1
View File
@@ -29,7 +29,7 @@
uint32 const VehNumWorldState[2] = { 3680, 3490 }; uint32 const VehNumWorldState[2] = { 3680, 3490 };
uint32 const MaxVehNumWorldState[2] = { 3681, 3491 }; uint32 const MaxVehNumWorldState[2] = { 3681, 3491 };
uint32 const ClockWorldState[2] = { 3781, 4354 }; uint32 const ClockWorldState[2] = { 3781, 4354 };
uint32 const WintergraspFaction[3] = { 1, 2, 35 }; uint32 const WintergraspFaction[3] = { 1732, 1735, 35 };
float const WintergraspStalkerPos[4] = { 0, 0, 0, 0 }; float const WintergraspStalkerPos[4] = { 0, 0, 0, 0 };
class BattlefieldWG; class BattlefieldWG;
src/server/scripts/Northrend/wintergrasp.cpp
+3 -7
View File
@@ -119,8 +119,6 @@ class npc_wg_demolisher_engineer : public CreatureScript
if (creature->isQuestGiver()) if (creature->isQuestGiver())
player->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (canBuild(creature)) if (canBuild(creature))
{ {
if (player->HasAura(SPELL_CORPORAL)) if (player->HasAura(SPELL_CORPORAL))
@@ -143,8 +141,6 @@ class npc_wg_demolisher_engineer : public CreatureScript
{ {
player->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
Battlefield* wintergrasp= sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (canBuild(creature)) if (canBuild(creature))
{ {
switch (action - GOSSIP_ACTION_INFO_DEF) switch (action - GOSSIP_ACTION_INFO_DEF)
@@ -169,9 +165,9 @@ class npc_wg_demolisher_engineer : public CreatureScript
bool canBuild(Creature* creature) bool canBuild(Creature* creature)
{ {
Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (!wintergrasp) if (!wintergrasp)
return false; return false;
switch (creature->GetEntry()) switch (creature->GetEntry())
{ {
case NPC_GOBLIN_MECHANIC: case NPC_GOBLIN_MECHANIC:
@@ -207,7 +203,7 @@ class npc_wg_spirit_guide : public CreatureScript
return true; return true;
} }
bool OnGossipSelect(Player* player, Creature* /*creature*/ , uint32 /*sender */ , uint32 action) bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action)
{ {
player->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
@@ -324,7 +320,7 @@ class go_wg_vehicle_teleporter : public GameObjectScript
uint32 _checkTimer; uint32 _checkTimer;
}; };
GameObjectAI* GetGameObjectAI(GameObject* go) const GameObjectAI* GetAI(GameObject* go) const
{ {
return new go_wg_vehicle_teleporterAI(go); return new go_wg_vehicle_teleporterAI(go);
} }