summaryrefslogtreecommitdiff
path: root/src/actormanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
commit311c175f3184103950c72bc5c775174597430b83 (patch)
treead022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/actormanager.cpp
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadManaVerse-311c175f3184103950c72bc5c775174597430b83.tar.gz
ManaVerse-311c175f3184103950c72bc5c775174597430b83.tar.bz2
ManaVerse-311c175f3184103950c72bc5c775174597430b83.tar.xz
ManaVerse-311c175f3184103950c72bc5c775174597430b83.zip
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.
Diffstat (limited to 'src/actormanager.cpp')
-rw-r--r--src/actormanager.cpp10
1 files changed, 5 insertions, 5 deletions
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<ActorSprite*> &beings,
+void ActorManager::findBeingsByPixel(STD_VECTOR<ActorSprite*> &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<Being*> sortedBeings;
+ STD_VECTOR<Being*> sortedBeings;
FOR_EACH (ActorSprites::iterator, i, mActors)
{
@@ -1264,7 +1264,7 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing,
}
beingEqualActorFinder.findBeing = localPlayer->getTarget();
- std::vector<Being*>::const_iterator i = std::find_if(
+ STD_VECTOR<Being*>::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<Being*> &beings,
+void ActorManager::printBeingsToChat(const STD_VECTOR<Being*> &beings,
const std::string &header)
{
if (debugChatTab == nullptr)
@@ -1659,7 +1659,7 @@ void ActorManager::printBeingsToChat(const std::vector<Being*> &beings,
ChatMsgType::BY_SERVER);
debugChatTab->chatLog(header, ChatMsgType::BY_SERVER);
- FOR_EACH (std::vector<Being*>::const_iterator, i, beings)
+ FOR_EACH (STD_VECTOR<Being*>::const_iterator, i, beings)
{
if (*i == nullptr)
continue;