Core: Fix warnings

This commit is contained in:
leak
2012-03-24 15:37:54 +01:00
parent bdbc1312c3
commit 3d0063abee
4 changed files with 9 additions and 5 deletions
+2 -2
View File
@@ -174,7 +174,7 @@ uint32 GetSecurity(uint32 accountId)
stmt->setUInt32(0, accountId);
PreparedQueryResult result = LoginDatabase.Query(stmt);
return (result) ? (*result)[0].GetUInt32() : SEC_PLAYER;
return (result) ? (*result)[0].GetUInt32() : uint32(SEC_PLAYER);
}
uint32 GetSecurity(uint32 accountId, int32 realmId)
@@ -184,7 +184,7 @@ uint32 GetSecurity(uint32 accountId, int32 realmId)
stmt->setInt32(1, realmId);
PreparedQueryResult result = LoginDatabase.Query(stmt);
return (result) ? (*result)[0].GetUInt32() : SEC_PLAYER;
return (result) ? (*result)[0].GetUInt32() : uint32(SEC_PLAYER);
}
bool GetName(uint32 accountId, std::string& name)
+4
View File
@@ -1526,8 +1526,10 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R
{
uint32 overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type];
if (!overrideLiquid && area->zone)
{
if (area = GetAreaEntryByAreaID(area->zone))
overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type];
}
if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid))
{
@@ -1799,8 +1801,10 @@ ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidTyp
{
uint32 overrideLiquid = area->LiquidTypeOverride[liquidFlagType];
if (!overrideLiquid && area->zone)
{
if (area = GetAreaEntryByAreaID(area->zone))
overrideLiquid = area->LiquidTypeOverride[liquidFlagType];
}
if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid))
{
@@ -619,7 +619,7 @@ public:
{
if (m_uiRangeCheckTimer < uiDiff)
{
if (Player* target = me->SelectNearestPlayer(2.0f))
if (me->SelectNearestPlayer(2.0f))
{
DoCastAOE(SPELL_UNLEASHED_DARK);
me->GetMotionMaster()->MoveIdle();
@@ -660,7 +660,7 @@ public:
{
if (m_uiRangeCheckTimer < uiDiff)
{
if (Player* target = me->SelectNearestPlayer(2.0f))
if (me->SelectNearestPlayer(2.0f))
{
DoCastAOE(SPELL_UNLEASHED_LIGHT);
me->GetMotionMaster()->MoveIdle();
@@ -491,7 +491,7 @@ public:
Creature* coilfangElite = me->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if (coilfangElite)
{
if (Unit* target = target = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
coilfangElite->AI()->AttackStart(target);
else if (me->getVictim())
coilfangElite->AI()->AttackStart(me->getVictim());