From a102628a6acaa64ca4b31d588cc9eedbb334d077 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 9 Apr 2016 15:47:25 +0300
Subject: Revert "Improve drawing player sprites performance."

This reverts commit 1dfc22f53967ad7e39d42ba8aabe0afa7445476e.
---
 src/being/being.cpp | 42 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

(limited to 'src/being/being.cpp')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index c20bb4ce1..57529b734 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -202,7 +202,6 @@ Being::Being(const BeingId id,
     mPets(),
     mOwner(nullptr),
     mSpecialParticle(nullptr),
-    mDrawSprites(),
 #ifdef EATHENA_SUPPORT
     mChat(nullptr),
     mHorseInfo(nullptr),
@@ -350,7 +349,6 @@ Being::~Being()
         }
     }
     mPets.clear();
-    mDrawSprites.clear();
 
     removeAllItemsParticles();
 #ifdef EATHENA_SUPPORT
@@ -2581,7 +2579,6 @@ void Being::setSprite(const unsigned int slot,
         if (beingEquipmentWindow)
             beingEquipmentWindow->updateBeing(this);
     }
-    updateDrawSprites();
 }
 
 void Being::setSpriteID(const unsigned int slot,
@@ -2987,10 +2984,14 @@ void Being::drawPlayerSprites(Graphics *restrict const graphics,
                               const int posX,
                               const int posY) const restrict2
 {
-    const size_t sz = mDrawSprites.size();
-    for (size_t f = 0; f < sz; f ++)
+    const int sz = CompoundSprite::getNumberOfLayers();
+    for (int f = 0; f < sz; f ++)
     {
-        Sprite *restrict const sprite = mDrawSprites[f];
+        const int rSprite = mSpriteHide[mSpriteRemap[f]];
+        if (rSprite == 1)
+            continue;
+
+        Sprite *restrict const sprite = mSprites[mSpriteRemap[f]];
         if (sprite)
         {
             sprite->setAlpha(mAlpha);
@@ -3003,10 +3004,14 @@ void Being::drawSpritesSDL(Graphics *restrict const graphics,
                            const int posX,
                            const int posY) const restrict2
 {
-    const size_t sz = mDrawSprites.size();
+    const size_t sz = mSprites.size();
     for (size_t f = 0; f < sz; f ++)
     {
-        const Sprite *restrict const sprite = mDrawSprites[f];
+        const int rSprite = mSpriteHide[mSpriteRemap[f]];
+        if (rSprite == 1)
+            continue;
+
+        const Sprite *restrict const sprite = mSprites[mSpriteRemap[f]];
         if (sprite)
             sprite->draw(graphics, posX, posY);
     }
@@ -3565,7 +3570,6 @@ void Being::recalcSpritesOrder() restrict2
             }
         }
     }
-    updateDrawSprites();
 }
 
 int Being::searchSlotValue(const std::vector<int> &restrict slotRemap,
@@ -4403,26 +4407,6 @@ void Being::serverRemove() restrict2 noexcept
     mTrickDead = false;
 }
 
-void Being::updateDrawSprites()
-{
-    if (mType != ActorType::Player)
-        return;
-    mDrawSprites.clear();
-    const size_t sz = CompoundSprite::getNumberOfLayers();
-    for (size_t f = 0; f < sz; f ++)
-    {
-        const int rSprite = mSpriteHide[mSpriteRemap[f]];
-        if (rSprite == 1)
-            continue;
-
-        Sprite *const sprite = mSprites[mSpriteRemap[f]];
-        if (sprite)
-        {
-            mDrawSprites.push_back(sprite);
-        }
-    }
-}
-
 #ifdef EATHENA_SUPPORT
 void Being::removeHorse() restrict2
 {
-- 
cgit v1.2.3-60-g2f50