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

Core: Fix warnings

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Accounts/AccountMgr.cpp
+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)
src/server/game/Maps/Map.cpp
+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))
{