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

Core: Kill off some warnings

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-12-27 22:58:22 +01:00
parent 52620db629
commit 464f1a9f8f
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.h
+4 -4
View File
@@ -811,10 +811,10 @@ class DamageInfo
private: private:
Unit * const m_attacker; Unit * const m_attacker;
Unit * const m_victim; Unit * const m_victim;
DamageEffectType const m_damageType; uint32 m_damage;
SpellEntry const * const m_spellInfo; SpellEntry const * const m_spellInfo;
SpellSchoolMask const m_schoolMask; SpellSchoolMask const m_schoolMask;
uint32 m_damage; DamageEffectType const m_damageType;
uint32 m_absorb; uint32 m_absorb;
uint32 m_resist; uint32 m_resist;
uint32 m_block; uint32 m_block;
@@ -851,9 +851,9 @@ public:
} }
Unit * GetAttacker() const { return m_attacker; }; Unit * GetAttacker() const { return m_attacker; };
Unit * GetVictim() const { return m_victim; }; Unit * GetVictim() const { return m_victim; };
DamageEffectType const GetDamageType() const { return m_damageType; }; DamageEffectType GetDamageType() const { return m_damageType; };
SpellEntry const * GetSpellInfo() const { return m_spellInfo; }; SpellEntry const * GetSpellInfo() const { return m_spellInfo; };
SpellSchoolMask const GetSchoolMask() const { return m_schoolMask; }; SpellSchoolMask GetSchoolMask() const { return m_schoolMask; };
uint32 GetDamage() const { return m_damage; }; uint32 GetDamage() const { return m_damage; };
uint32 GetAbsorb() const { return m_absorb; }; uint32 GetAbsorb() const { return m_absorb; };
uint32 GetResist() const { return m_resist; }; uint32 GetResist() const { return m_resist; };
src/server/game/Entities/Vehicle/Vehicle.cpp
+1 -1
View File
@@ -280,7 +280,7 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId, bool byAura)
if (seatId < 0) // no specific seat requirement if (seatId < 0) // no specific seat requirement
{ {
for (seat = m_Seats.begin(); seat != m_Seats.end(); ++seat) for (seat = m_Seats.begin(); seat != m_Seats.end(); ++seat)
if (!seat->second.passenger && ((!byAura && seat->second.seatInfo->IsUsableByPlayer() || (byAura && seat->second.seatInfo->IsUsableByAura())))) if (!seat->second.passenger && ((!(byAura && seat->second.seatInfo->IsUsableByPlayer()) || (byAura && seat->second.seatInfo->IsUsableByAura()))))
break; break;
if (seat == m_Seats.end()) // no available seat if (seat == m_Seats.end()) // no available seat
src/server/game/Quests/QuestDef.h
+2 -2
View File
@@ -359,10 +359,10 @@ struct QuestStatusData
memset(m_creatureOrGOcount, 0, QUEST_OBJECTIVES_COUNT * sizeof(uint16)); memset(m_creatureOrGOcount, 0, QUEST_OBJECTIVES_COUNT * sizeof(uint16));
} }
QuestStatus m_status;
bool m_explored;
uint32 m_timer; uint32 m_timer;
uint16 m_itemcount[QUEST_ITEM_OBJECTIVES_COUNT]; uint16 m_itemcount[QUEST_ITEM_OBJECTIVES_COUNT];
uint16 m_creatureOrGOcount[QUEST_OBJECTIVES_COUNT]; uint16 m_creatureOrGOcount[QUEST_OBJECTIVES_COUNT];
QuestStatus m_status;
bool m_explored;
}; };
#endif #endif
src/server/game/Server/Protocol/Handlers/PetHandler.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ void WorldSession::HandleDismissCritter(WorldPacket &recv_data)
uint64 guid; uint64 guid;
recv_data >> guid; recv_data >> guid;
sLog->outDebug("WORLD: Received CMSG_DISMISS_CRITTER for GUID " UI64FMTD "", guid); sLog->outDebug("WORLD: Received CMSG_DISMISS_CRITTER for GUID " UI64FMTD, guid);
Unit* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid); Unit* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid);
src/server/game/Spells/SpellScript.h
+1 -1
View File
@@ -304,7 +304,7 @@ class AuraScript : public _SpellScript
typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const *, bool &, int32 &); \ typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const *, bool &, int32 &); \
typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const *, SpellModifier *&); \ typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const *, SpellModifier *&); \
typedef void(CLASSNAME::*AuraEffectAbsorbFnType)(AuraEffect *, DamageInfo &, uint32 &); \ typedef void(CLASSNAME::*AuraEffectAbsorbFnType)(AuraEffect *, DamageInfo &, uint32 &); \
//typedef void(CLASSNAME::*AuraAbsorbFnType)(AuraEffect *, DamageInfo &); \ //typedef void(CLASSNAME::*AuraAbsorbFnType)(AuraEffect *, DamageInfo &);
AURASCRIPT_FUNCTION_TYPE_DEFINES(AuraScript) AURASCRIPT_FUNCTION_TYPE_DEFINES(AuraScript)