From 0e0affb76f7930994dcb972aead2df555288bad2 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 24 Mar 2009 15:04:28 -0600 Subject: Remove some unneeded #ifdefs in SpriteDef --- src/resources/spritedef.cpp | 2 -- src/resources/spritedef.h | 2 -- 2 files changed, 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, -- cgit v1.2.3-70-g09d2