From 89ed318d3ca8e57423599d9b8cd37d839b66d19b Mon Sep 17 00:00:00 2001 From: David Cernat Date: Thu, 6 Apr 2017 06:17:27 +0300 Subject: [PATCH] [Client] Remove usage of nullptr that Travis CI is getting stuck on --- apps/openmw/mwmp/Cell.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmp/Cell.cpp b/apps/openmw/mwmp/Cell.cpp index a3a061991..571e7fd2c 100644 --- a/apps/openmw/mwmp/Cell.cpp +++ b/apps/openmw/mwmp/Cell.cpp @@ -28,7 +28,7 @@ void Cell::update() LocalActor *actor = it->second; // 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()); localActors.erase(it++); @@ -37,6 +37,7 @@ void Cell::update() { LOG_APPEND(Log::LOG_VERBOSE, "- Updating LocalActor %s", it->first.c_str()); actor->update(); + ++it; } }