diff options
| author | megamage <none@none> | 2009-03-23 17:01:26 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-23 17:01:26 -0600 |
| commit | 84d0aae7fcc33cd1eb19bdb9f56c9a8014d0f759 (patch) | |
| tree | 3400b08cc100b2c5121ec7755ef743292e60f5f4 /src | |
| parent | 40fc36869419b30b3a48660c3c1873a10d8d1d1e (diff) | |
*Use return false to replace assert false in InstanceMap::Add
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Map.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index d53fc81cffc..f482d724af3 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -2255,7 +2255,8 @@ bool InstanceMap::Add(Player *player) { sLog.outError("InstanceMap::Add: player %s(%d) is being put in instance %d,%d,%d,%d,%d,%d but he is in group %d and is bound to instance %d,%d,%d,%d,%d,%d!", player->GetName(), player->GetGUIDLow(), mapSave->GetMapId(), mapSave->GetInstanceId(), mapSave->GetDifficulty(), mapSave->GetPlayerCount(), mapSave->GetGroupCount(), mapSave->CanReset(), GUID_LOPART(pGroup->GetLeaderGUID()), playerBind->save->GetMapId(), playerBind->save->GetInstanceId(), playerBind->save->GetDifficulty(), playerBind->save->GetPlayerCount(), playerBind->save->GetGroupCount(), playerBind->save->CanReset()); if(groupBind) sLog.outError("InstanceMap::Add: the group is bound to instance %d,%d,%d,%d,%d,%d", groupBind->save->GetMapId(), groupBind->save->GetInstanceId(), groupBind->save->GetDifficulty(), groupBind->save->GetPlayerCount(), groupBind->save->GetGroupCount(), groupBind->save->CanReset()); - assert(false); + //assert(false); + return false; } // bind to the group or keep using the group save if(!groupBind) |