diff options
| author | whiterandrek | 2018-05-21 13:57:01 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
| commit | 8733e54cd413819f87cb470e6c645d1320a54bf2 (patch) | |
| tree | f26d850ab3eebfe6e9fa9e0511e4c56cabf284c4 /engines/pink/objects/walk | |
| parent | 39ed15d2f700575ad68c638808f9cf07dc786ec1 (diff) | |
| download | scummvm-rg350-8733e54cd413819f87cb470e6c645d1320a54bf2.tar.gz scummvm-rg350-8733e54cd413819f87cb470e6c645d1320a54bf2.tar.bz2 scummvm-rg350-8733e54cd413819f87cb470e6c645d1320a54bf2.zip | |
PINK: remove the use of auto variables
Diffstat (limited to 'engines/pink/objects/walk')
| -rw-r--r-- | engines/pink/objects/walk/walk_mgr.cpp | 10 | ||||
| -rw-r--r-- | engines/pink/objects/walk/walk_shortest_path.cpp | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/engines/pink/objects/walk/walk_mgr.cpp b/engines/pink/objects/walk/walk_mgr.cpp index ed6cb39a1b..eb2ce5e204 100644 --- a/engines/pink/objects/walk/walk_mgr.cpp +++ b/engines/pink/objects/walk/walk_mgr.cpp @@ -41,10 +41,12 @@ void WalkMgr::deserialize(Pink::Archive &archive) { } WalkLocation *WalkMgr::findLocation(const Common::String &name) { - auto it = Common::find_if(_locations.begin(), _locations.end(), [&name](WalkLocation *location) { - return location->getName() == name; - }); - return (it != _locations.end()) ? *it : nullptr; + for (uint i = 0; i < _locations.size(); ++i) { + if (_locations[i]->getName() == name) { + return _locations[i]; + } + } + return nullptr; } void WalkMgr::toConsole() { diff --git a/engines/pink/objects/walk/walk_shortest_path.cpp b/engines/pink/objects/walk/walk_shortest_path.cpp index 2148d4c0a8..ca07da9602 100644 --- a/engines/pink/objects/walk/walk_shortest_path.cpp +++ b/engines/pink/objects/walk/walk_shortest_path.cpp @@ -91,7 +91,7 @@ void WalkShortestPath::addLocationsToVisit() { double WalkShortestPath::getLengthToNearestNeigbor(WalkLocation *location) { double minLength = -1.0; - auto &neighbors = location->getNeigbors(); + Common::StringArray &neighbors = location->getNeigbors(); for (int i = 0; i < neighbors.size(); ++i) { WalkLocation *neighbor = _manager->findLocation(neighbors[i]); if (!isLocationVisited(neighbor)){ @@ -110,7 +110,7 @@ double WalkShortestPath::getLengthToNearestNeigbor(WalkLocation *location) { WalkLocation *WalkShortestPath::findNearestNeighbor(WalkLocation *location) { double minLength = -1.0; WalkLocation *nearest = nullptr; - auto neighbors = location->getNeigbors(); + Common::StringArray &neighbors = location->getNeigbors(); for (int i = 0; i < neighbors.size(); ++i) { WalkLocation *neighbor = _manager->findLocation(neighbors[i]); if (!isLocationVisited(neighbor)){ |