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

0.6.1
David Cernat 8 years ago
parent 67ec81ad0c
commit 89ed318d3c

@ -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;
} }
} }

Loading…
Cancel
Save