Revert "Core: more more cleanup" - Build test anyone?

This reverts commit 20cd4c71ee.
This commit is contained in:
leak
2012-03-14 18:51:51 +01:00
parent b02a012b47
commit 2a5caef4a6
27 changed files with 804 additions and 804 deletions
@@ -267,11 +267,11 @@ public:
//dosen't work at all
if (uiShieldBreakerTimer <= uiDiff)
{
Vehicle* vehicle = me->GetVehicleKit();
if (!vehicle)
Vehicle* pVehicle = me->GetVehicleKit();
if (!pVehicle)
return;
if (Unit* pPassenger = vehicle->GetPassenger(SEAT_ID_0))
if (Unit* pPassenger = pVehicle->GetPassenger(SEAT_ID_0))
{
Map::PlayerList const& players = me->GetMap()->GetPlayers();
if (me->GetMap()->IsDungeon() && !players.isEmpty())
@@ -221,8 +221,8 @@ public:
{
uiVehicle1GUID = pBoss->GetGUID();
uint64 uiGrandChampionBoss1 = 0;
if (Vehicle* vehicle = pBoss->GetVehicleKit())
if (Unit* unit = vehicle->GetPassenger(0))
if (Vehicle* pVehicle = pBoss->GetVehicleKit())
if (Unit* unit = pVehicle->GetPassenger(0))
uiGrandChampionBoss1 = unit->GetGUID();
if (instance)
{
@@ -236,8 +236,8 @@ public:
{
uiVehicle2GUID = pBoss->GetGUID();
uint64 uiGrandChampionBoss2 = 0;
if (Vehicle* vehicle = pBoss->GetVehicleKit())
if (Unit* unit = vehicle->GetPassenger(0))
if (Vehicle* pVehicle = pBoss->GetVehicleKit())
if (Unit* unit = pVehicle->GetPassenger(0))
uiGrandChampionBoss2 = unit->GetGUID();
if (instance)
{
@@ -251,8 +251,8 @@ public:
{
uiVehicle3GUID = pBoss->GetGUID();
uint64 uiGrandChampionBoss3 = 0;
if (Vehicle* vehicle = pBoss->GetVehicleKit())
if (Unit* unit = vehicle->GetPassenger(0))
if (Vehicle* pVehicle = pBoss->GetVehicleKit())
if (Unit* unit = pVehicle->GetPassenger(0))
uiGrandChampionBoss3 = unit->GetGUID();
if (instance)
{