Core/Misc: Fix static analysis issues

Fix some static analysis issues reported by Coverity

(cherry picked from commit 89c535cf2a960ccc03cd1a032310984f9b4e1d47)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
This commit is contained in:
jackpoz authored and Nayd committed 2015-02-02 01:45:38 +00:00
1 parent 13cbed36ef
commit 7b05b0cb81
2 files changed
+7 -1

No files matched your search

+1 -1
View File
@@ -19086,7 +19086,7 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report
else if (mapDiff->hasErrorMessage) // if (missingAchievement) covered by this case
SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY, target_difficulty);
else if (missingItem)
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, sObjectMgr->GetItemTemplate(missingItem)->Name1.c_str());
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(missingItem))->Name1.c_str());
else if (LevelMin)
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED), LevelMin);
}
+6
View File
@@ -49,4 +49,10 @@ namespace Trinity
#define ASSERT WPAssert
template <typename T> inline T* ASSERT_NOTNULL(T* pointer)
{
ASSERT(pointer);
return pointer;
}
#endif