X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.h;h=ef17b751c28c1a230e613cfe5266dea64dd88368;hb=2b18d7e2549f4be99533fed58c0f07887a19db37;hp=ecd753dd4534c2f0dc47da0b8e963cd240489711;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git diff --git a/src/badguy/badguy.h b/src/badguy/badguy.h index ecd753dd4..ef17b751c 100644 --- a/src/badguy/badguy.h +++ b/src/badguy/badguy.h @@ -17,7 +17,6 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. - #ifndef __BADGUY_H__ #define __BADGUY_H__ @@ -26,7 +25,7 @@ #include "timer.h" #include "moving_object.h" #include "sprite/sprite.h" -#include "math/physic.h" +#include "physic.h" #include "object/player.h" #include "serializable.h" #include "resources.h" @@ -39,8 +38,6 @@ #include "video/drawing_context.h" #include "sprite/sprite_manager.h" -using namespace SuperTux; - class BadGuy : public MovingObject, public Serializable { public: @@ -147,7 +144,7 @@ private: void try_activate(); State state; - Timer2 state_timer; + Timer state_timer; }; #endif