diff options
| -rw-r--r-- | src/resources/spriteaction.h | 5 | ||||
| -rw-r--r-- | src/resources/spritedef.cpp | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/resources/spriteaction.h b/src/resources/spriteaction.h index d46150a46..61967f155 100644 --- a/src/resources/spriteaction.h +++ b/src/resources/spriteaction.h @@ -40,14 +40,9 @@ namespace SpriteAction 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"); diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index d63ffdd8e..9930f58b9 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -157,13 +157,9 @@ void SpriteDef::substituteActions() substituteAction(SpriteAction::STAND, SpriteAction::DEFAULT); substituteAction(SpriteAction::MOVE, SpriteAction::STAND); substituteAction(SpriteAction::ATTACK, SpriteAction::STAND); - substituteAction(SpriteAction::CAST_MAGIC, SpriteAction::ATTACK); - substituteAction(SpriteAction::USE_ITEM, SpriteAction::CAST_MAGIC); substituteAction(SpriteAction::SIT, SpriteAction::STAND); substituteAction(SpriteAction::SITTOP, SpriteAction::SIT); - substituteAction(SpriteAction::SLEEP, SpriteAction::SIT); - substituteAction(SpriteAction::HURT, SpriteAction::STAND); - substituteAction(SpriteAction::DEAD, SpriteAction::HURT); + substituteAction(SpriteAction::DEAD, SpriteAction::STAND); substituteAction(SpriteAction::SPAWN, SpriteAction::STAND); substituteAction(SpriteAction::FLY, SpriteAction::MOVE); substituteAction(SpriteAction::SWIM, SpriteAction::MOVE); |