diff options
author | Nay <dnpd.dd@gmail.com> | 2012-08-30 22:44:03 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-08-30 22:44:03 +0100 |
commit | abbb896cfb73017cf1c313d597984a9ce0a9dcab (patch) | |
tree | 58cd6165976448c3cdec18c4e4c6381c6bfba936 /src/server/scripts/World | |
parent | 5f1977cb1d690d2e60a1f5355244ec472e014278 (diff) |
Core: Fix many "errors"/warnings and coding style (2)
Scripts; also reverted a change to AuthSocket
Errors were found using Cppcheck, open-source static analysis tool
Diffstat (limited to 'src/server/scripts/World')
-rwxr-xr-x | src/server/scripts/World/achievement_scripts.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp index 60572ee3e6a..a6f4f7f64f9 100755 --- a/src/server/scripts/World/achievement_scripts.cpp +++ b/src/server/scripts/World/achievement_scripts.cpp @@ -278,6 +278,9 @@ class achievement_tilted : public AchievementCriteriaScript bool OnCheck(Player* player, Unit* /*target*/) { + if (!player) + return false; + bool checkArea = player->GetAreaId() == AREA_ARGENT_TOURNAMENT_FIELDS || player->GetAreaId() == AREA_RING_OF_ASPIRANTS || player->GetAreaId() == AREA_RING_OF_ARGENT_VALIANTS || @@ -285,7 +288,7 @@ class achievement_tilted : public AchievementCriteriaScript player->GetAreaId() == AREA_RING_OF_HORDE_VALIANTS || player->GetAreaId() == AREA_RING_OF_CHAMPIONS; - return player && checkArea && player->duel && player->duel->isMounted; + return checkArea && player->duel && player->duel->isMounted; } }; |