projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolled back bomb to old behaviour, some bomb gfx tuning
[supertux.git]
/
src
/
badguy
/
mrtree.hpp
diff --git
a/src/badguy/mrtree.hpp
b/src/badguy/mrtree.hpp
index
fd2aebb
..
0b884a1
100644
(file)
--- a/
src/badguy/mrtree.hpp
+++ b/
src/badguy/mrtree.hpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,38
+12,26
@@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef __MRTREE_H__
#define __MRTREE_H__
#ifndef __MRTREE_H__
#define __MRTREE_H__
-#include "badguy.hpp"
+#include "
walking_
badguy.hpp"
-class MrTree : public
BadG
uy
+class MrTree : public
WalkingBadg
uy
{
public:
MrTree(const lisp::Lisp& reader);
{
public:
MrTree(const lisp::Lisp& reader);
-
- void activate();
- void active_update(float elapsed_time);
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
- HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
- HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
+ virtual MrTree* clone() const { return new MrTree(*this); }
protected:
protected:
- enum MyState {
- STATE_BIG, STATE_NORMAL
- };
- MyState mystate;
- bool stay_on_platform;
-
- Timer invincible_timer;
+ bool collision_squished(GameObject& object);
- bool collision_squished(Player& player);
};
#endif
};
#endif