From a4400a4ff1088af90abda2fd2f00bc550e7afb6a Mon Sep 17 00:00:00 2001 From: GustavoBlaze Date: Tue, 24 Jan 2017 14:56:21 -0200 Subject: [PATCH] applying the otclient code style changing the variables names --- src/client/thingtype.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/client/thingtype.cpp b/src/client/thingtype.cpp index ff1f2c35..d2407191 100644 --- a/src/client/thingtype.cpp +++ b/src/client/thingtype.cpp @@ -271,9 +271,8 @@ void ThingType::unserialize(uint16 clientId, ThingCategory category, const FileS bool hasFrameGroups = (category == ThingCategoryCreature && g_game.getFeature(Otc::GameIdleAnimations)); uint8 groupCount = hasFrameGroups ? fin->getU8() : 1; - m_animationPhases = 0; - int lastTotalSprites = 0; + int realTotalSprites = 0; for(int i = 0; i < groupCount; ++i) { uint8 frameGroupType = FrameGroupDefault; @@ -297,25 +296,25 @@ void ThingType::unserialize(uint16 clientId, ThingCategory category, const FileS m_numPatternZ = fin->getU8(); else m_numPatternZ = 1; - int n_phases = fin->getU8(); - - m_animationPhases += n_phases; + + int groupAnimationsPhases = fin->getU8(); + m_animationPhases += groupAnimationsPhases; - if(n_phases > 1 && g_game.getFeature(Otc::GameEnhancedAnimations)) { + if(groupAnimationsPhases > 1 && g_game.getFeature(Otc::GameEnhancedAnimations)) { m_animator = AnimatorPtr(new Animator); - m_animator->unserialize(n_phases, fin); + m_animator->unserialize(groupAnimationsPhases, fin); } - int totalSprites = m_size.area() * m_layers * m_numPatternX * m_numPatternY * m_numPatternZ * n_phases; + int totalSprites = m_size.area() * m_layers * m_numPatternX * m_numPatternY * m_numPatternZ * groupAnimationsPhases; - if((lastTotalSprites+totalSprites) > 4096) + if((realTotalSprites+totalSprites) > 4096) stdext::throw_exception("a thing type has more than 4096 sprites"); - m_spritesIndex.resize((lastTotalSprites+totalSprites)); - for(int i = lastTotalSprites; i < (lastTotalSprites+totalSprites); i++) + m_spritesIndex.resize((realTotalSprites+totalSprites)); + for(int i = lastTotalSprites; i < (realTotalSprites+totalSprites); i++) m_spritesIndex[i] = g_game.getFeature(Otc::GameSpritesU32) ? fin->getU32() : fin->getU16(); - lastTotalSprites += totalSprites; + realTotalSprites += totalSprites; } m_textures.resize(m_animationPhases);