diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-03-08 19:11:02 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-03-08 19:11:02 +0100 |
| commit | 9710c41a40a311d363304853b33d0fee3f751383 (patch) | |
| tree | 8d98282b74329fa225af85b42678d6ffbddb1da7 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | cbbfb52ca766cb3b9e8cb2a6e9cf04f42d356ab1 (diff) | |
More warning fixes
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 9e5350124b0..ae028b7b7a1 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -197,8 +197,8 @@ LanguageDesc const* GetLanguageDescByID(uint32 lang) bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clickee) const { - Player const* playerClicker = NULL; - if (playerClicker = clicker->ToPlayer()) + Player const* playerClicker = clicker->ToPlayer(); + if (playerClicker) { if (questStart) { @@ -6736,7 +6736,7 @@ uint32 ObjectMgr::GenerateAuctionID() uint64 ObjectMgr::GenerateEquipmentSetGuid() { - if (m_equipmentSetGuid >= 0xFFFFFFFFFFFFFFFEll) + if (m_equipmentSetGuid >= uint64(0xFFFFFFFFFFFFFFFELL)) { sLog->outError("EquipmentSet guid overflow!! Can't continue, shutting down server. "); World::StopNow(ERROR_EXIT_CODE); |