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/being/being.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/being/being.h') diff --git a/src/being/being.h b/src/being/being.h index 8bba7548d..6f9e753d9 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -1184,7 +1184,7 @@ class Being notfinal : public ActorSprite, typedef std::map SpriteParticleInfo; typedef SpriteParticleInfo::iterator SpriteParticleInfoIter; - std::vector mSlots; + STD_VECTOR mSlots; SpriteParticleInfo mSpriteParticles; // Character guild information @@ -1226,12 +1226,12 @@ class Being notfinal : public ActorSprite, template int getOffset() const restrict2 A_WARN_UNUSED; - int searchSlotValue(const std::vector &restrict slotRemap, + int searchSlotValue(const STD_VECTOR &restrict slotRemap, const int val) const restrict2 A_WARN_UNUSED; - static void searchSlotValueItr(std::vector::iterator &restrict it, + static void searchSlotValueItr(STD_VECTOR::iterator &restrict it, int &idx, - std::vector &restrict slotRemap, + STD_VECTOR &restrict slotRemap, const int val); void addSpiritBalls(const unsigned int balls, @@ -1286,9 +1286,9 @@ class Being notfinal : public ActorSprite, Particle *restrict mSpecialParticle; ChatObject *restrict mChat; HorseInfo *restrict mHorseInfo; - std::vector mDownHorseSprites; - std::vector mUpHorseSprites; - std::vector mSpiritParticles; + STD_VECTOR mDownHorseSprites; + STD_VECTOR mUpHorseSprites; + STD_VECTOR mSpiritParticles; int mX; // position in tiles int mY; // position in tiles -- cgit v1.2.3-70-g09d2