diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:56:11 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:56:11 +0100 |
| commit | 76cfbe09ef909c0eebf558dec3f5f4917dd14de2 (patch) | |
| tree | 8a5f39783b0f41e194a78c2b4fed152dddacdb2d /src/resources | |
| parent | d2bec790d7a1d5a0adc9f97ec24f085cf86e3238 (diff) | |
| parent | 0e0affb76f7930994dcb972aead2df555288bad2 (diff) | |
| download | mana-client-76cfbe09ef909c0eebf558dec3f5f4917dd14de2.tar.gz mana-client-76cfbe09ef909c0eebf558dec3f5f4917dd14de2.tar.bz2 mana-client-76cfbe09ef909c0eebf558dec3f5f4917dd14de2.tar.xz mana-client-76cfbe09ef909c0eebf558dec3f5f4917dd14de2.zip | |
Merge branch 'origin/master'
Conflicts:
.mailmap
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/spritedef.cpp | 2 | ||||
| -rw-r--r-- | src/resources/spritedef.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 390bd3d0..125edbea 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -348,7 +348,6 @@ SpriteAction SpriteDef::makeSpriteAction(const std::string &action) else if (action == "attack_throw") { return ACTION_ATTACK_THROW; } -#ifdef TMWSERV_SUPPORT else if (action == "special0") { return ACTION_SPECIAL_0; } @@ -379,7 +378,6 @@ SpriteAction SpriteDef::makeSpriteAction(const std::string &action) else if (action == "special9") { return ACTION_SPECIAL_9; } -#endif else if (action == "cast_magic") { return ACTION_CAST_MAGIC; } diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index c3db8d64..cd7bd7f0 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -43,7 +43,6 @@ enum SpriteAction ACTION_ATTACK_STAB, ACTION_ATTACK_BOW, ACTION_ATTACK_THROW, -#ifdef TMWSERV_SUPPORT ACTION_SPECIAL_0, ACTION_SPECIAL_1, ACTION_SPECIAL_2, @@ -54,7 +53,6 @@ enum SpriteAction ACTION_SPECIAL_7, ACTION_SPECIAL_8, ACTION_SPECIAL_9, -#endif ACTION_CAST_MAGIC, ACTION_USE_ITEM, ACTION_SIT, |