mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 01:37:00 +00:00
[12125] Fix some warnings
* Fix compiler warnings "warning: no newline at end of file" (Linux/GCC). * Fix compiler warnings "warning: '<class>::<member>' will be initialized after <class>::<member>" (Linux/GCC). * Fix compiler warnings "warning: unused parameter '<param>'" (Linux/GCC). * Fix a signed/unsigned warning Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
parent
02ce53b7dd
commit
6fa6eb24a5
19 changed files with 50 additions and 36 deletions
|
|
@ -156,15 +156,17 @@ bool CreatureCreatePos::Relocate(Creature* cr) const
|
|||
return true;
|
||||
}
|
||||
|
||||
Creature::Creature(CreatureSubtype subtype) :
|
||||
Unit(), i_AI(NULL),
|
||||
lootForPickPocketed(false), lootForBody(false), lootForSkin(false), m_groupLootTimer(0), m_groupLootId(0),
|
||||
Creature::Creature(CreatureSubtype subtype) : Unit(),
|
||||
i_AI(NULL),
|
||||
lootForPickPocketed(false), lootForBody(false), lootForSkin(false),
|
||||
m_groupLootTimer(0), m_groupLootId(0),
|
||||
m_lootMoney(0), m_lootGroupRecipientId(0),
|
||||
m_corpseDecayTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_respawnradius(5.0f),
|
||||
m_subtype(subtype), m_defaultMovementType(IDLE_MOTION_TYPE), m_equipmentId(0),
|
||||
m_AlreadyCallAssistance(false), m_AlreadySearchedAssistance(false),
|
||||
m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false),
|
||||
m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_originalEntry(0), m_temporaryFactionFlags(TEMPFACTION_NONE),
|
||||
m_temporaryFactionFlags(TEMPFACTION_NONE),
|
||||
m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_originalEntry(0),
|
||||
m_creatureInfo(NULL)
|
||||
{
|
||||
m_regenTimer = 200;
|
||||
|
|
|
|||
|
|
@ -1072,8 +1072,10 @@ void Object::MarkForClientUpdate()
|
|||
}
|
||||
}
|
||||
|
||||
WorldObject::WorldObject()
|
||||
: m_isActiveObject(false), m_currMap(NULL), m_mapId(0), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL), m_transportInfo(NULL)
|
||||
WorldObject::WorldObject() :
|
||||
m_transportInfo(NULL), m_currMap(NULL),
|
||||
m_mapId(0), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL),
|
||||
m_isActiveObject(false)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -143,15 +143,14 @@ template uint32 IdGenerator<uint32>::Generate();
|
|||
template uint64 IdGenerator<uint64>::Generate();
|
||||
|
||||
ObjectMgr::ObjectMgr() :
|
||||
m_FirstTemporaryCreatureGuid(1),
|
||||
m_FirstTemporaryGameObjectGuid(1),
|
||||
|
||||
m_ArenaTeamIds("Arena team ids"),
|
||||
m_AuctionIds("Auction ids"),
|
||||
m_EquipmentSetIds("Equipment set ids"),
|
||||
m_GuildIds("Guild ids"),
|
||||
m_MailIds("Mail ids"),
|
||||
m_PetNumbers("Pet numbers")
|
||||
m_PetNumbers("Pet numbers"),
|
||||
m_FirstTemporaryCreatureGuid(1),
|
||||
m_FirstTemporaryGameObjectGuid(1)
|
||||
{
|
||||
// Only zero condition left, others will be added while loading DB tables
|
||||
mConditions.resize(1);
|
||||
|
|
|
|||
|
|
@ -355,4 +355,4 @@ void OutdoorPvPEP::UnsummonSoldiers(const WorldObject* objRef)
|
|||
}
|
||||
|
||||
m_soldiers.clear();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -266,4 +266,4 @@ class OutdoorPvPEP : public OutdoorPvP
|
|||
GuidList m_towerBanners[MAX_EP_TOWERS];
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -216,4 +216,4 @@ class OutdoorPvPNA : public OutdoorPvP
|
|||
std::queue<HalaaSoldiersSpawns> m_deadSoldiers;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -14722,7 +14722,7 @@ bool Player::SatisfyQuestDay(Quest const* qInfo, bool msg) const
|
|||
return true;
|
||||
}
|
||||
|
||||
bool Player::SatisfyQuestWeek(Quest const* qInfo, bool msg) const
|
||||
bool Player::SatisfyQuestWeek(Quest const* qInfo, bool /*msg*/) const
|
||||
{
|
||||
if (!qInfo->IsWeekly() || m_weeklyquests.empty())
|
||||
return true;
|
||||
|
|
@ -14731,7 +14731,7 @@ bool Player::SatisfyQuestWeek(Quest const* qInfo, bool msg) const
|
|||
return m_weeklyquests.find(qInfo->GetQuestId()) == m_weeklyquests.end();
|
||||
}
|
||||
|
||||
bool Player::SatisfyQuestMonth(Quest const* qInfo, bool msg) const
|
||||
bool Player::SatisfyQuestMonth(Quest const* qInfo, bool /*msg*/) const
|
||||
{
|
||||
if (!qInfo->IsMonthly() || m_monthlyquests.empty())
|
||||
return true;
|
||||
|
|
@ -15354,7 +15354,7 @@ void Player::SendQuestCompleteEvent(uint32 quest_id)
|
|||
}
|
||||
}
|
||||
|
||||
void Player::SendQuestReward(Quest const* pQuest, uint32 XP, Object* questGiver)
|
||||
void Player::SendQuestReward(Quest const* pQuest, uint32 XP, Object* /*questGiver*/)
|
||||
{
|
||||
uint32 questid = pQuest->GetQuestId();
|
||||
DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_QUEST_COMPLETE quest = %u", questid);
|
||||
|
|
@ -18878,7 +18878,7 @@ void Player::AddSpellMod(Aura* aura, bool apply)
|
|||
m_spellMods[mod->m_miscvalue].remove(aura);
|
||||
}
|
||||
|
||||
template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T& basevalue, Spell const* spell)
|
||||
template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T& basevalue, Spell const* /*spell*/)
|
||||
{
|
||||
SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
|
||||
if (!spellInfo)
|
||||
|
|
|
|||
|
|
@ -8751,9 +8751,11 @@ bool Aura::HasMechanic(uint32 mechanic) const
|
|||
}
|
||||
|
||||
SpellAuraHolder::SpellAuraHolder(SpellEntry const* spellproto, Unit* target, WorldObject* caster, Item* castItem) :
|
||||
m_spellProto(spellproto), m_target(target), m_castItemGuid(castItem ? castItem->GetObjectGuid() : ObjectGuid()),
|
||||
m_auraSlot(MAX_AURAS), m_auraFlags(AFLAG_NONE), m_auraLevel(1), m_procCharges(0),
|
||||
m_stackAmount(1), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_AuraDRGroup(DIMINISHING_NONE), m_timeCla(1000),
|
||||
m_spellProto(spellproto),
|
||||
m_target(target), m_castItemGuid(castItem ? castItem->GetObjectGuid() : ObjectGuid()),
|
||||
m_auraSlot(MAX_AURAS), m_auraFlags(AFLAG_NONE), m_auraLevel(1),
|
||||
m_procCharges(0), m_stackAmount(1),
|
||||
m_timeCla(1000), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_AuraDRGroup(DIMINISHING_NONE),
|
||||
m_permanent(false), m_isRemovedOnShapeLost(true), m_deleted(false), m_in_use(0)
|
||||
{
|
||||
MANGOS_ASSERT(target);
|
||||
|
|
|
|||
|
|
@ -39,8 +39,10 @@ class MANGOS_DLL_SPEC TargetedMovementGeneratorMedium
|
|||
{
|
||||
protected:
|
||||
TargetedMovementGeneratorMedium(Unit& target, float offset, float angle) :
|
||||
TargetedMovementGeneratorBase(target), i_offset(offset), i_angle(angle),
|
||||
i_recalculateTravel(false), i_targetReached(false), i_recheckDistance(0),
|
||||
TargetedMovementGeneratorBase(target),
|
||||
i_recheckDistance(0),
|
||||
i_offset(offset), i_angle(angle),
|
||||
i_recalculateTravel(false), i_targetReached(false),
|
||||
i_path(NULL)
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -464,10 +464,12 @@ void GlobalCooldownMgr::CancelGlobalCooldown(SpellEntry const* spellInfo)
|
|||
// Methods of class Unit
|
||||
|
||||
Unit::Unit() :
|
||||
i_motionMaster(this), m_ThreatManager(this), m_HostileRefManager(this),
|
||||
movespline(new Movement::MoveSpline()),
|
||||
m_charmInfo(NULL),
|
||||
i_motionMaster(this),
|
||||
m_vehicleInfo(NULL),
|
||||
movespline(new Movement::MoveSpline())
|
||||
m_ThreatManager(this),
|
||||
m_HostileRefManager(this)
|
||||
{
|
||||
m_objectType |= TYPEMASK_UNIT;
|
||||
m_objectTypeId = TYPEID_UNIT;
|
||||
|
|
|
|||
|
|
@ -1462,8 +1462,8 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
|
|||
bool IsLevitating() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_LEVITATING);}
|
||||
bool IsWalking() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_WALK_MODE);}
|
||||
bool IsRooted() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_ROOT); }
|
||||
virtual void SetRoot(bool enabled) {}
|
||||
virtual void SetWaterWalk(bool enabled) {}
|
||||
virtual void SetRoot(bool /*enabled*/) {}
|
||||
virtual void SetWaterWalk(bool /*enabled*/) {}
|
||||
|
||||
void SetInFront(Unit const* target);
|
||||
void SetFacingTo(float ori);
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
//#include "pchdef.h"
|
||||
//#include "pchdef.h"
|
||||
|
|
|
|||
|
|
@ -222,8 +222,10 @@ class MANGOS_DLL_SPEC Database
|
|||
void AllowAsyncTransactions() { m_bAllowAsyncTransactions = true; }
|
||||
|
||||
protected:
|
||||
Database() : m_pAsyncConn(NULL), m_pResultQueue(NULL), m_threadBody(NULL), m_delayThread(NULL),
|
||||
m_logSQL(false), m_pingIntervallms(0), m_nQueryConnPoolSize(1), m_bAllowAsyncTransactions(false), m_iStmtIndex(-1)
|
||||
Database() :
|
||||
m_nQueryConnPoolSize(1), m_pAsyncConn(NULL), m_pResultQueue(NULL),
|
||||
m_threadBody(NULL), m_delayThread(NULL), m_bAllowAsyncTransactions(false),
|
||||
m_iStmtIndex(-1), m_logSQL(false), m_pingIntervallms(0)
|
||||
{
|
||||
m_nQueryCounter = -1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -403,7 +403,7 @@ void MySqlPreparedStatement::bind(const SqlStmtParameters& holder)
|
|||
return;
|
||||
}
|
||||
|
||||
int nIndex = 0;
|
||||
unsigned int nIndex = 0;
|
||||
SqlStmtParameters::ParameterContainer const& _args = holder.params();
|
||||
|
||||
SqlStmtParameters::ParameterContainer::const_iterator iter_last = _args.end();
|
||||
|
|
@ -421,7 +421,7 @@ void MySqlPreparedStatement::bind(const SqlStmtParameters& holder)
|
|||
}
|
||||
}
|
||||
|
||||
void MySqlPreparedStatement::addParam(int nIndex, const SqlStmtFieldData& data)
|
||||
void MySqlPreparedStatement::addParam(unsigned int nIndex, const SqlStmtFieldData& data)
|
||||
{
|
||||
MANGOS_ASSERT(m_pInputArgs);
|
||||
MANGOS_ASSERT(nIndex < m_nParams);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class MANGOS_DLL_SPEC MySqlPreparedStatement : public SqlPreparedStatement
|
|||
|
||||
protected:
|
||||
// bind parameters
|
||||
void addParam(int nIndex, const SqlStmtFieldData& data);
|
||||
void addParam(unsigned int nIndex, const SqlStmtFieldData& data);
|
||||
|
||||
static enum_field_types ToMySQLType(const SqlStmtFieldData& data, my_bool& bUnsigned);
|
||||
|
||||
|
|
|
|||
|
|
@ -316,7 +316,10 @@ class MANGOS_DLL_SPEC SqlPreparedStatement
|
|||
virtual bool execute() = 0;
|
||||
|
||||
protected:
|
||||
SqlPreparedStatement(const std::string& fmt, SqlConnection& conn) : m_szFmt(fmt), m_nParams(0), m_nColumns(0), m_bPrepared(false), m_bIsQuery(false), m_pConn(conn) {}
|
||||
SqlPreparedStatement(const std::string& fmt, SqlConnection& conn) :
|
||||
m_nParams(0), m_nColumns(0), m_bIsQuery(false),
|
||||
m_bPrepared(false), m_szFmt(fmt), m_pConn(conn)
|
||||
{}
|
||||
|
||||
uint32 m_nParams;
|
||||
uint32 m_nColumns;
|
||||
|
|
|
|||
|
|
@ -142,4 +142,4 @@ struct ShortTimeTracker
|
|||
int32 i_expiryTime;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -550,4 +550,4 @@ void hexEncodeByteArray(uint8* bytes, uint32 arrayLen, std::string& result)
|
|||
}
|
||||
}
|
||||
result = ss.str();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "12124"
|
||||
#define REVISION_NR "12125"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue