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

Core: Corrected NULL usage, it should only be used with pointers, not integers

Browse Source
This commit is contained in:
Shauren
2011-04-23 15:53:48 +02:00
parent a2a751b9d6
commit 8898db8b27
56 changed files with 216 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Pet/Pet.cpp
+2 -2
View File
@@ -1293,8 +1293,8 @@ void Pet::_SaveAuras(SQLTransaction& trans)
}
else
{
baseDamage[i] = NULL;
damage[i] = NULL;
baseDamage[i] = 0;
damage[i] = 0;
}
}
src/server/game/Entities/Unit/Unit.cpp
+2 -2
View File
@@ -3703,8 +3703,8 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit
}
else
{
baseDamage[i] = NULL;
damage[i] = NULL;
baseDamage[i] = 0;
damage[i] = 0;
}
}
src/server/game/Entities/Unit/Unit.h
+3 -3
View File
@@ -1645,15 +1645,15 @@ class Unit : public WorldObject
void RemoveAura(AuraApplication * aurApp, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
void RemoveAura(Aura * aur, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
void RemoveAurasDueToSpell(uint32 spellId, uint64 caster = NULL, uint8 reqEffMask = 0, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT);
void RemoveAuraFromStack(uint32 spellId, uint64 caster = NULL, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT);
void RemoveAurasDueToSpell(uint32 spellId, uint64 caster = 0, uint8 reqEffMask = 0, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT);
void RemoveAuraFromStack(uint32 spellId, uint64 caster = 0, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT);
inline void RemoveAuraFromStack(AuraMap::iterator &iter,AuraRemoveMode removeMode);
void RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit *dispeller);
void RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit *stealer);
void RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId);
void RemoveAurasByType(AuraType auraType, uint64 casterGUID = 0, Aura * except = NULL, bool negative = true, bool positive = true);
void RemoveNotOwnSingleTargetAuras(uint32 newPhase = 0x0);
void RemoveAurasWithInterruptFlags(uint32 flag, uint32 except = NULL);
void RemoveAurasWithInterruptFlags(uint32 flag, uint32 except = 0);
void RemoveAurasWithAttribute(uint32 flags);
void RemoveAurasWithFamily(SpellFamilyNames family, uint32 familyFlag1, uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID);
void RemoveAurasWithMechanic(uint32 mechanic_mask, AuraRemoveMode removemode = AURA_REMOVE_BY_DEFAULT, uint32 except=0);
src/server/game/Entities/Vehicle/Vehicle.cpp
+1 -1
View File
@@ -294,7 +294,7 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
if (Unit* passenger = ObjectAccessor::GetUnit(*GetBase(), seat->second.passenger))
passenger->ExitVehicle();
else
seat->second.passenger = NULL;
seat->second.passenger = 0;
}
ASSERT(!seat->second.passenger);
src/server/game/Entities/Vehicle/Vehicle.h
+1 -1
View File
@@ -79,7 +79,7 @@ enum VehicleSpells
struct VehicleSeat
{
explicit VehicleSeat(VehicleSeatEntry const *_seatInfo) : seatInfo(_seatInfo), passenger(NULL) {}
explicit VehicleSeat(VehicleSeatEntry const *_seatInfo) : seatInfo(_seatInfo), passenger(0) {}
VehicleSeatEntry const *seatInfo;
uint64 passenger;
};