diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-04-22 11:07:58 +0200 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-04-22 11:07:58 +0200 |
| commit | d42ab6c8bdfd7abe635a1ddd590797b10ab9baeb (patch) | |
| tree | 60ad56e40f7bec64183f21d482a1e724d23a3a9a /src | |
| parent | de60e63862d448b6931614a84d7cf0f93c33aeec (diff) | |
Core/ScriptedAI: Reset VehicleKit in BossAI::_Reset()
Core/Vehicles: Minor log fix and comment a redundant assertion
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 3 | ||||
| -rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.cpp | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 75ba3790e54..78ea3d9c5e6 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -516,6 +516,9 @@ void BossAI::_Reset() if (!me->isAlive()) return; + if (me->GetVehicleKit()) + me->GetVehicleKit()->Reset(); + me->ResetLootMode(); events.Reset(); summons.DespawnAll(); diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 65c06b56049..546048fc8d6 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -141,7 +141,7 @@ void Vehicle::Uninstall() void Vehicle::Reset() { - sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Reset"); + sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Reset Entry: %u, GuidLow: %u", m_creatureEntry, me->GetGUIDLow()); if (me->GetTypeId() == TYPEID_PLAYER) { if (m_usableSeatNum) @@ -169,9 +169,9 @@ void Vehicle::RemoveAllPassengers() // Following the above logic, this assertion should NEVER fail. // Even in 'hacky' cases, there should at least be VEHICLE_SPELL_RIDE_HARDCODED on us. - SeatMap::const_iterator itr; - for (itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) - ASSERT(!itr->second.passenger); + // SeatMap::const_iterator itr; + // for (itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) + // ASSERT(!itr->second.passenger); } bool Vehicle::HasEmptySeat(int8 seatId) const |