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

*use ASSERT macro instead of regular assert for better output.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2010-07-30 20:04:28 +02:00
parent 3dc29732b7
commit 48b360097c
50 changed files with 261 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Vehicle/Vehicle.cpp
+9 -9
View File
@@ -61,13 +61,13 @@ Vehicle::Vehicle(Unit *unit, VehicleEntry const *vehInfo) : me(unit), m_vehicleI
default:
break;
}
assert(!m_Seats.empty());
ASSERT(!m_Seats.empty());
}
Vehicle::~Vehicle()
{
for (SeatMap::const_iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr)
assert(!itr->second.passenger);
ASSERT(!itr->second.passenger);
}
void Vehicle::Install()
@@ -171,7 +171,7 @@ void Vehicle::RemoveAllPassengers()
if (itr->second.passenger)
{
sLog.outCrash("Vehicle %u cannot remove passenger %u. %u is still on vehicle.", me->GetEntry(), passenger->GetEntry(), itr->second.passenger->GetEntry());
//assert(!itr->second.passenger);
//ASSERT(!itr->second.passenger);
itr->second.passenger = NULL;
}
}
@@ -222,7 +222,7 @@ void Vehicle::InstallAccessory(uint32 entry, int8 seatId, bool minion)
// already installed
if (passenger->GetEntry() == entry)
{
assert(passenger->GetTypeId() == TYPEID_UNIT);
ASSERT(passenger->GetTypeId() == TYPEID_UNIT);
if (me->GetTypeId() == TYPEID_UNIT && me->ToCreature()->IsInEvadeMode() && passenger->ToCreature()->IsAIEnabled)
passenger->ToCreature()->AI()->EnterEvadeMode();
return;
@@ -265,7 +265,7 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
if (seat->second.passenger)
seat->second.passenger->ExitVehicle();
assert(!seat->second.passenger);
ASSERT(!seat->second.passenger);
}
sLog.outDebug("Unit %s enter vehicle entry %u id %u dbguid %u seat %d", unit->GetName(), me->GetEntry(), m_vehicleInfo->m_ID, me->GetGUIDLow(), (int32)seat->first);
@@ -273,7 +273,7 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
seat->second.passenger = unit;
if (seat->second.seatInfo->IsUsable())
{
assert(m_usableSeatNum);
ASSERT(m_usableSeatNum);
--m_usableSeatNum;
if (!m_usableSeatNum)
{
@@ -302,7 +302,7 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
&& unit->GetTypeId() == TYPEID_PLAYER
&& seat->first == 0 && seat->second.seatInfo->m_flags & 0x800) // not right
if (!me->SetCharmedBy(unit, CHARM_TYPE_VEHICLE))
assert(false);
ASSERT(false);
if (me->IsInWorld())
{
@@ -335,7 +335,7 @@ void Vehicle::RemovePassenger(Unit *unit)
if (seat->second.passenger == unit)
break;
assert(seat != m_Seats.end());
ASSERT(seat != m_Seats.end());
sLog.outDebug("Unit %s exit vehicle entry %u id %u dbguid %u seat %d", unit->GetName(), me->GetEntry(), m_vehicleInfo->m_ID, me->GetGUIDLow(), (int32)seat->first);
@@ -372,7 +372,7 @@ void Vehicle::RemovePassenger(Unit *unit)
void Vehicle::RelocatePassengers(float x, float y, float z, float ang)
{
Map *map = me->GetMap();
assert(map != NULL);
ASSERT(map != NULL);
// not sure that absolute position calculation is correct, it must depend on vehicle orientation and pitch angle
for (SeatMap::const_iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr)