teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] Remove usage of nullptr that Travis CI is getting stuck on

Browse source
This commit is contained in:
David Cernat 2017-04-06 06:17:27 +03:00
parent 67ec81ad0c
commit 89ed318d3c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwmp/Cell.cpp
View file

@ -28,7 +28,7 @@ void Cell::update()
LocalActor *actor = it->second; LocalActor *actor = it->second;
// TODO:: Make sure this condition actually works // TODO:: Make sure this condition actually works
if (actor->getPtr().getCell() != nullptr && actor->getPtr().getCell() != store) if (actor->getPtr().getCell() && actor->getPtr().getCell() != store)
{ {
LOG_APPEND(Log::LOG_INFO, "- Removing LocalActor %s which is no longer in this cell", it->first.c_str()); LOG_APPEND(Log::LOG_INFO, "- Removing LocalActor %s which is no longer in this cell", it->first.c_str());
localActors.erase(it++); localActors.erase(it++);
@ -37,6 +37,7 @@ void Cell::update()
{ {
LOG_APPEND(Log::LOG_VERBOSE, "- Updating LocalActor %s", it->first.c_str()); LOG_APPEND(Log::LOG_VERBOSE, "- Updating LocalActor %s", it->first.c_str());
actor->update(); actor->update();
++it; ++it;
} }
} }