From 311c175f3184103950c72bc5c775174597430b83 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 14 Jul 2017 01:31:22 +0300 Subject: Replace std::vector into macro STD_VECTOR. In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features. --- src/actormanager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/actormanager.cpp') diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 66fc5485d..ebc3dc50e 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -576,7 +576,7 @@ Being *ActorManager::findBeingByPixel(const int x, const int y, } } -void ActorManager::findBeingsByPixel(std::vector &beings, +void ActorManager::findBeingsByPixel(STD_VECTOR &beings, const int x, const int y, const AllPlayers allPlayers) const { @@ -1181,7 +1181,7 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing, if (cycleSelect) { - std::vector sortedBeings; + STD_VECTOR sortedBeings; FOR_EACH (ActorSprites::iterator, i, mActors) { @@ -1264,7 +1264,7 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing, } beingEqualActorFinder.findBeing = localPlayer->getTarget(); - std::vector::const_iterator i = std::find_if( + STD_VECTOR::const_iterator i = std::find_if( sortedBeings.begin(), sortedBeings.end(), beingEqualActorFinder); if (i == sortedBeings.end() || ++i == sortedBeings.end()) @@ -1649,7 +1649,7 @@ void ActorManager::printBeingsToChat(const std::string &header) const } } -void ActorManager::printBeingsToChat(const std::vector &beings, +void ActorManager::printBeingsToChat(const STD_VECTOR &beings, const std::string &header) { if (debugChatTab == nullptr) @@ -1659,7 +1659,7 @@ void ActorManager::printBeingsToChat(const std::vector &beings, ChatMsgType::BY_SERVER); debugChatTab->chatLog(header, ChatMsgType::BY_SERVER); - FOR_EACH (std::vector::const_iterator, i, beings) + FOR_EACH (STD_VECTOR::const_iterator, i, beings) { if (*i == nullptr) continue; -- cgit v1.2.3-60-g2f50