aboutsummaryrefslogtreecommitdiff
path: root/src/game/MapInstanced.cpp
diff options
context:
space:
mode:
authorSpp <none@none>2010-04-19 17:03:10 +0200
committerSpp <none@none>2010-04-19 17:03:10 +0200
commitbe01821050dd30ff65e89b347d528efb20aba028 (patch)
tree6d33e686bf1c5d664a7104a208a4e057c6337b1e /src/game/MapInstanced.cpp
parentf74e969a069646eca6227bdede974223c07e9c94 (diff)
More warning removal (Some code modifications and cleanup when needed)
--HG-- branch : trunk
Diffstat (limited to 'src/game/MapInstanced.cpp')
-rw-r--r--src/game/MapInstanced.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp
index 3fe5d1b8b0b..0736bfa6fb3 100644
--- a/src/game/MapInstanced.cpp
+++ b/src/game/MapInstanced.cpp
@@ -150,8 +150,12 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player)
InstanceGroupBind *groupBind = NULL;
Group *group = player->GetGroup();
// use the player's difficulty setting (it may not be the same as the group's)
- if (group && (groupBind = group->GetBoundInstance(this)))
- pSave = groupBind->save;
+ if (group)
+ {
+ groupBind = group->GetBoundInstance(this);
+ if (groupBind)
+ pSave = groupBind->save;
+ }
}
if (pSave)
{