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

Core/Battlefield: codystyle/whitespace cleanup. fix a stupid typo. attempt to get team using the vehicle creator instead of the vehicle

Browse Source
This commit is contained in:
Kandera
2012-08-20 13:52:01 -04:00
parent 483f0a6a4e
commit 2d45e26012
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+11 -13
View File
@@ -523,17 +523,14 @@ void BattlefieldWG::OnCreatureCreate(Creature* creature)
case NPC_WINTERGRASP_CATAPULT:
case NPC_WINTERGRASP_DEMOLISHER:
{
uint8 team;
if (creature->getFaction() == WintergraspFaction[TEAM_ALLIANCE])
team = TEAM_ALLIANCE;
else if (creature->getFaction() == WintergraspFaction[TEAM_HORDE])
team = TEAM_HORDE;
else
if (!creature->GetCreatorGUID() || !sObjectAccessor->FindPlayer(creature->GetCreatorGUID()))
return;
Player* creator = sObjectAccessor->FindPlayer(creature->GetCreatorGUID());
TeamId team = creator->GetTeamId();
if (team == TEAM_HORDE)
{
if (GetData(BATTLEFIELD_WG_DATA_VEHICLE_H) <= GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_H))
if (GetData(BATTLEFIELD_WG_DATA_VEHICLE_H) < GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_H))
{
UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_H, 1);
creature->CastSpell(creature, SPELL_HORDE_FLAG, true);
@@ -543,28 +540,29 @@ void BattlefieldWG::OnCreatureCreate(Creature* creature)
else
{
creature->setDeathState(DEAD);
creature->SetRespawnTime(RESPAWN_ONE_DAY);
creature->RemoveFromWorld();
return;
}
}
else
{
if (GetData(BATTLEFIELD_WG_DATA_VEHICLE_A) <= GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A))
if (GetData(BATTLEFIELD_WG_DATA_VEHICLE_A) < GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A))
{
UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_A, 1);
creature->CastSpell(creature, SPELL_HORDE_FLAG, true);
creature->CastSpell(creature, SPELL_ALLIANCE_FLAG, true);
m_vehicles[team].insert(creature->GetGUID());
UpdateVehicleCountWG();
}
else
{
creature->setDeathState(DEAD);
creature->SetRespawnTime(RESPAWN_ONE_DAY);
creature->RemoveFromWorld();
return;
}
}
if (creature->GetOwner())
creature->CastSpell(creature->GetOwner(), SPELL_GRAB_PASSENGER, true);
if (creature->GetCreatorGUID() && sObjectAccessor->FindUnit(creature->GetCreatorGUID()))
creature->CastSpell(sObjectAccessor->FindUnit(creature->GetCreatorGUID()), SPELL_GRAB_PASSENGER, true);
break;
}
}