summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-14 16:15:55 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-14 16:15:55 +0300
commit1a5c1d155337923ab8b0c208ba7cc4dc3cb70e18 (patch)
tree8fbed46fc67d300e4a2b770df73ede2d75cb5b79
parent49814ad77b3ed16ab66ae35f7fa3cae95faaa1f9 (diff)
downloadplus-1a5c1d155337923ab8b0c208ba7cc4dc3cb70e18.tar.gz
plus-1a5c1d155337923ab8b0c208ba7cc4dc3cb70e18.tar.bz2
plus-1a5c1d155337923ab8b0c208ba7cc4dc3cb70e18.tar.xz
plus-1a5c1d155337923ab8b0c208ba7cc4dc3cb70e18.zip
Remove unused sprite action mapping.
-rw-r--r--src/resources/spriteaction.h5
-rw-r--r--src/resources/spritedef.cpp6
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);