diff options
| -rw-r--r-- | src/resources/spriteaction.h | 7 | ||||
| -rw-r--r-- | src/resources/spritedef.cpp | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/resources/spriteaction.h b/src/resources/spriteaction.h index e1504e69c..d46150a46 100644 --- a/src/resources/spriteaction.h +++ b/src/resources/spriteaction.h @@ -49,18 +49,25 @@ namespace SpriteAction static const std::string CAST_MAGIC("magic"); static const std::string USE_ITEM("item"); static const std::string SPAWN("spawn"); + static const std::string FLY("fly"); static const std::string SWIM("swim"); + static const std::string RIDE("ride"); static const std::string STANDSKY("standsky"); static const std::string STANDWATER("standwater"); + static const std::string STANDRIDE("standride"); static const std::string SITSKY("sitsky"); static const std::string SITWATER("sitwater"); + static const std::string SITRIDE("sitride"); static const std::string ATTACKSKY("attacksky"); static const std::string ATTACKWATER("attackwater"); + static const std::string ATTACKRIDE("attackride"); static const std::string SPAWNSKY("spawnsky"); static const std::string SPAWNWATER("spawnwater"); + static const std::string SPAWNRIDE("spawnride"); static const std::string DEADSKY("deadsky"); static const std::string DEADWATER("deadwater"); + static const std::string DEADRIDE("deadride"); static const std::string INVALID(""); } // namespace SpriteAction diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 6ea358448..1f5b02610 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -165,16 +165,22 @@ void SpriteDef::substituteActions() substituteAction(SpriteAction::SPAWN, SpriteAction::STAND); substituteAction(SpriteAction::FLY, SpriteAction::MOVE); substituteAction(SpriteAction::SWIM, SpriteAction::MOVE); + substituteAction(SpriteAction::RIDE, SpriteAction::MOVE); substituteAction(SpriteAction::STANDSKY, SpriteAction::STAND); substituteAction(SpriteAction::STANDWATER, SpriteAction::STAND); + substituteAction(SpriteAction::STANDRIDE, SpriteAction::STAND); substituteAction(SpriteAction::SITSKY, SpriteAction::SIT); substituteAction(SpriteAction::SITWATER, SpriteAction::SIT); + substituteAction(SpriteAction::SITRIDE, SpriteAction::SIT); substituteAction(SpriteAction::ATTACKSKY, SpriteAction::ATTACK); substituteAction(SpriteAction::ATTACKWATER, SpriteAction::ATTACK); + substituteAction(SpriteAction::ATTACKRIDE, SpriteAction::ATTACK); substituteAction(SpriteAction::SPAWNSKY, SpriteAction::SPAWN); substituteAction(SpriteAction::SPAWNWATER, SpriteAction::SPAWN); + substituteAction(SpriteAction::SPAWNRIDE, SpriteAction::SPAWN); substituteAction(SpriteAction::DEADSKY, SpriteAction::DEAD); substituteAction(SpriteAction::DEADWATER, SpriteAction::DEAD); + substituteAction(SpriteAction::DEADRIDE, SpriteAction::DEAD); } void SpriteDef::loadSprite(const XmlNodePtr spriteNode, const int variant, |