diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/spritedef.cpp | 12 | ||||
| -rw-r--r-- | src/resources/spritedef.h | 39 |
2 files changed, 38 insertions, 13 deletions
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index cc47e34c0..16d120b0f 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -158,6 +158,18 @@ void SpriteDef::substituteActions() substituteAction(SpriteAction::HURT, SpriteAction::STAND); substituteAction(SpriteAction::DEAD, SpriteAction::HURT); substituteAction(SpriteAction::SPAWN, SpriteAction::STAND); + substituteAction(SpriteAction::FLY, SpriteAction::MOVE); + substituteAction(SpriteAction::SWIM, SpriteAction::MOVE); + substituteAction(SpriteAction::STANDSKY, SpriteAction::STAND); + substituteAction(SpriteAction::STANDWATER, SpriteAction::STAND); + substituteAction(SpriteAction::SITSKY, SpriteAction::SIT); + substituteAction(SpriteAction::SITWATER, SpriteAction::SIT); + substituteAction(SpriteAction::ATTACKSKY, SpriteAction::ATTACK); + substituteAction(SpriteAction::ATTACKWATER, SpriteAction::ATTACK); + substituteAction(SpriteAction::SPAWNSKY, SpriteAction::SPAWN); + substituteAction(SpriteAction::SPAWNWATER, SpriteAction::SPAWN); + substituteAction(SpriteAction::DEADSKY, SpriteAction::DEAD); + substituteAction(SpriteAction::DEADWATER, SpriteAction::DEAD); } void SpriteDef::loadSprite(const XmlNodePtr spriteNode, const int variant, diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 2a01bb9d7..26c768776 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -84,19 +84,32 @@ typedef std::vector<SpriteReference*>::const_iterator SpriteRefs; */ namespace SpriteAction { - static const std::string DEFAULT = "stand"; - static const std::string STAND = "stand"; - static const std::string SIT = "sit"; - static const std::string SITTOP = "sittop"; - static const std::string SLEEP = "sleep"; - static const std::string DEAD = "dead"; - static const std::string MOVE = "walk"; - static const std::string ATTACK = "attack"; - static const std::string HURT = "hurt"; - static const std::string USE_SPECIAL = "special"; - static const std::string CAST_MAGIC = "magic"; - static const std::string USE_ITEM = "item"; - static const std::string SPAWN = "spawn"; + static const std::string DEFAULT("stand"); + static const std::string STAND("stand"); + static const std::string SIT("sit"); + static const std::string SITTOP("sittop"); + static const std::string SLEEP("sleep"); + static const std::string DEAD("dead"); + static const std::string MOVE("walk"); + static const std::string ATTACK("attack"); + static const std::string HURT("hurt"); + static const std::string USE_SPECIAL("special"); + 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 STANDSKY("standsky"); + static const std::string STANDWATER("standwater"); + static const std::string SITSKY("sitsky"); + static const std::string SITWATER("sitwater"); + static const std::string ATTACKSKY("attacksky"); + static const std::string ATTACKWATER("attackwater"); + static const std::string SPAWNSKY("spawnsky"); + static const std::string SPAWNWATER("spawnwater"); + static const std::string DEADSKY("deadsky"); + static const std::string DEADWATER("deadwater"); + static const std::string INVALID(""); } // namespace SpriteAction |