diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-10-18 20:00:38 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-10-18 20:08:15 +0300 |
commit | cf6a135902b647b565e782e9cb9626b7ac8b361b (patch) | |
tree | a6cebb27ca4f89ea5e559958dac2a4af9afa87d2 /src/resources | |
parent | a3ad4ab670c7fa776375f569e9fe9d7fbe227245 (diff) | |
download | manaplus-cf6a135902b647b565e782e9cb9626b7ac8b361b.tar.gz manaplus-cf6a135902b647b565e782e9cb9626b7ac8b361b.tar.bz2 manaplus-cf6a135902b647b565e782e9cb9626b7ac8b361b.tar.xz manaplus-cf6a135902b647b565e782e9cb9626b7ac8b361b.zip |
Add support for multiply sprites in each horse part.
Also fix horse sprites actions issue.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/db/horsedb.cpp | 49 | ||||
-rw-r--r-- | src/resources/horseinfo.h | 12 | ||||
-rw-r--r-- | src/resources/spritedisplay.h | 2 | ||||
-rw-r--r-- | src/resources/spritereference.h | 4 |
4 files changed, 37 insertions, 30 deletions
diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp index 41754bd77..df1e6345c 100644 --- a/src/resources/db/horsedb.cpp +++ b/src/resources/db/horsedb.cpp @@ -21,13 +21,14 @@ #include "resources/db/horsedb.h" -#include "animatedsprite.h" #include "configuration.h" #include "logger.h" #include "resources/beingcommon.h" #include "resources/horseinfo.h" +#include "utils/dtor.h" + #include "debug.h" namespace @@ -38,11 +39,15 @@ namespace } #define loadSprite(name) \ - currentInfo->name = AnimatedSprite::load( \ - paths.getStringValue("sprites").append(std::string( \ - reinterpret_cast<const char*>( \ - spriteNode->xmlChildrenNode->content))), \ - XML::getProperty(spriteNode, "variant", 0)) + { \ + SpriteReference *const currentSprite = new SpriteReference; \ + currentSprite->sprite = paths.getStringValue("sprites").append( \ + std::string(reinterpret_cast<const char*>( \ + spriteNode->xmlChildrenNode->content))); \ + currentSprite->variant = XML::getProperty( \ + spriteNode, "variant", 0); \ + currentInfo->name.push_back(currentSprite); \ + } static void loadDownSprites(XmlNodePtrConst parentNode, HorseInfo *currentInfo); @@ -55,10 +60,18 @@ void HorseDB::load() if (mLoaded) unload(); - mUnknown.downSprite = AnimatedSprite::load( + SpriteReference *currentSprite = new SpriteReference; + currentSprite->sprite = paths.getStringValue("sprites").append( paths.getStringValue("spriteErrorFile")); - mUnknown.upSprite = AnimatedSprite::load( + currentSprite->variant = 0; + mUnknown.downSprites.push_back(currentSprite); + + currentSprite = new SpriteReference; + currentSprite->sprite = paths.getStringValue("sprites").append( paths.getStringValue("spriteErrorFile")); + currentSprite->variant = 0; + mUnknown.upSprites.push_back(currentSprite); + mUnknown.upOffsetX = 0; mUnknown.upOffsetY = 0; mUnknown.downOffsetX = 0; @@ -129,7 +142,7 @@ void HorseDB::loadXmlFile(const std::string &fileName) continue; if (xmlNameEqual(spriteNode, "sprite")) - loadSprite(downSprite); + loadSprite(downSprites) if (xmlNameEqual(spriteNode, "down")) loadDownSprites(spriteNode, currentInfo); @@ -149,10 +162,7 @@ static void loadDownSprites(XmlNodePtrConst parentNode, continue; if (xmlNameEqual(spriteNode, "sprite")) - { - loadSprite(downSprite); - return; - } + loadSprite(downSprites) } } @@ -165,10 +175,7 @@ static void loadUpSprites(XmlNodePtrConst parentNode, continue; if (xmlNameEqual(spriteNode, "sprite")) - { - loadSprite(upSprite); - return; - } + loadSprite(upSprites) } } @@ -176,14 +183,14 @@ void HorseDB::unload() { FOR_EACH (HorseInfos::const_iterator, i, mHorseInfos) { - delete i->second->upSprite; - delete i->second->downSprite; + delete_all(i->second->upSprites); + delete_all(i->second->downSprites); delete i->second; } mHorseInfos.clear(); - delete mUnknown.upSprite; - delete mUnknown.downSprite; + delete_all(mUnknown.upSprites); + delete_all(mUnknown.downSprites); mLoaded = false; } diff --git a/src/resources/horseinfo.h b/src/resources/horseinfo.h index 860700124..8a96902d8 100644 --- a/src/resources/horseinfo.h +++ b/src/resources/horseinfo.h @@ -22,15 +22,15 @@ #ifndef RESOURCES_HORSEINFO_H #define RESOURCES_HORSEINFO_H -#include "localconsts.h" +#include "resources/spritereference.h" + +#include <vector> -class AnimatedSprite; +#include "localconsts.h" struct HorseInfo final { HorseInfo() : - downSprite(nullptr), - upSprite(nullptr), downOffsetX(0), downOffsetY(0), upOffsetX(0), @@ -39,8 +39,8 @@ struct HorseInfo final A_DELETE_COPY(HorseInfo) - AnimatedSprite *downSprite; - AnimatedSprite *upSprite; + std::vector<SpriteReference*> downSprites; + std::vector<SpriteReference*> upSprites; int downOffsetX; int downOffsetY; int upOffsetX; diff --git a/src/resources/spritedisplay.h b/src/resources/spritedisplay.h index 3885eb65b..edeee10c8 100644 --- a/src/resources/spritedisplay.h +++ b/src/resources/spritedisplay.h @@ -43,6 +43,4 @@ struct SpriteDisplay final StringVect particles; }; -typedef std::vector<SpriteReference*>::const_iterator SpriteRefs; - #endif // RESOURCES_SPRITEDISPLAY_H diff --git a/src/resources/spritereference.h b/src/resources/spritereference.h index b61f54a19..a68b0d792 100644 --- a/src/resources/spritereference.h +++ b/src/resources/spritereference.h @@ -23,7 +23,7 @@ #ifndef RESOURCES_SPRITEREFERENCE_H #define RESOURCES_SPRITEREFERENCE_H -#include <string> +#include "utils/stringvector.h" #include "localconsts.h" @@ -48,4 +48,6 @@ struct SpriteReference final int variant; }; +typedef std::vector<SpriteReference*>::const_iterator SpriteRefs; + #endif // RESOURCES_SPRITEREFERENCE_H |