aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2013-02-16 17:04:44 +0000
committerNay <dnpd.dd@gmail.com>2013-02-16 17:04:44 +0000
commita614dd775c4a377aea038307701b197fa492b54d (patch)
tree0c7a2d7ef89521b9afd63c7eda8292735b98e12a /src/server/game
parente448d24f2b6df22fdc1cfe2b7d7521f9f25ee861 (diff)
Say NO to whitespace
Diffstat (limited to 'src/server/game')
-rwxr-xr-xsrc/server/game/Entities/Vehicle/Vehicle.cpp8
-rw-r--r--src/server/game/Entities/Vehicle/Vehicle.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 4fb93a85fdf..7469e522ee0 100755
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -338,7 +338,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
// exits the vehicle will dismiss. That's why the actual adding the passenger to the vehicle is scheduled
// asynchronously, so it can be cancelled easily in case the vehicle is uninstalled meanwhile.
SeatMap::iterator seat;
- sLog->outDebug(LOG_FILTER_VEHICLES, "Unit %s scheduling enter vehicle entry %u id %u dbguid %u seat %d",
+ sLog->outDebug(LOG_FILTER_VEHICLES, "Unit %s scheduling enter vehicle entry %u id %u dbguid %u seat %d",
unit->GetName().c_str(), _me->GetEntry(), _vehicleInfo->m_ID, _me->GetGUIDLow(), seatId);
VehicleJoinEvent* e = new VehicleJoinEvent(this, unit);
unit->m_Events.AddEvent(e, unit->m_Events.CalculateTime(0));
@@ -525,7 +525,7 @@ void Vehicle::CalculatePassengerOffset(float& x, float& y, float& z, float& o)
y = (iny - inx * tan(GetBase()->GetOrientation())) / (cos(GetBase()->GetOrientation()) + std::sin(GetBase()->GetOrientation()) * tan(GetBase()->GetOrientation()));
x = (inx + iny * tan(GetBase()->GetOrientation())) / (cos(GetBase()->GetOrientation()) + std::sin(GetBase()->GetOrientation()) * tan(GetBase()->GetOrientation()));
}
-
+
void Vehicle::CancelJoinEvent(VehicleJoinEvent* e)
{
e->to_Abort = true;
@@ -593,9 +593,9 @@ bool VehicleJoinEvent::Execute(uint64, uint32)
if (Target->GetBase()->GetTypeId() == TYPEID_UNIT)
sScriptMgr->OnAddPassenger(Target, Passenger, Seat->first);
- return true;
+ return true;
}
-
+
void VehicleJoinEvent::Abort(uint64)
{
Passenger->m_vehicle = NULL;
diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h
index 25a68e0e511..dbdd021a384 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.h
+++ b/src/server/game/Entities/Vehicle/Vehicle.h
@@ -96,7 +96,7 @@ class Vehicle : public TransportBase
Unit* _me;
VehicleEntry const* _vehicleInfo;
GuidSet vehiclePlayers;
-
+
uint32 _creatureEntry; // Can be different than me->GetBase()->GetEntry() in case of players
Status _status;
Position m_lastShootPos;