diff options
| author | leak <leak@bitmx.net> | 2012-03-24 15:37:54 +0100 |
|---|---|---|
| committer | leak <leak@bitmx.net> | 2012-03-24 15:37:54 +0100 |
| commit | 3d0063abee02bca855f98cb9b45f92c5a9d86215 (patch) | |
| tree | 49aea25bced4c4104d8f08263bcb008a2b86a032 /src/server/game | |
| parent | bdbc1312c3e595b0720407d32e6fc7cb92daf14a (diff) | |
Core: Fix warnings
Diffstat (limited to 'src/server/game')
| -rwxr-xr-x | src/server/game/Accounts/AccountMgr.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Maps/Map.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index 4886b20a0f2..cd3baca7923 100755 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -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) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 86d95857cce..379aa4a9722 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -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)) { |