projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverted bigger parts of tuxdev patch:
[supertux.git]
/
src
/
badguy
/
mrbomb.hpp
diff --git
a/src/badguy/mrbomb.hpp
b/src/badguy/mrbomb.hpp
index
8fa7f5a
..
845c063
100644
(file)
--- a/
src/badguy/mrbomb.hpp
+++ b/
src/badguy/mrbomb.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,34
+12,29
@@
// 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 __MRBOMB_H__
#define __MRBOMB_H__
#ifndef __MRBOMB_H__
#define __MRBOMB_H__
-#include "badguy.hpp"
+#include "
walking_
badguy.hpp"
-class MrBomb : public
BadG
uy
+class MrBomb : public
WalkingBadg
uy
{
public:
MrBomb(const lisp::Lisp& reader);
{
public:
MrBomb(const lisp::Lisp& reader);
- MrBomb(
float pos_x, float pos_y
, Direction d);
+ MrBomb(
const Vector& pos
, Direction d);
- void activate();
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);
void kill_fall();
void kill_fall();
+ virtual MrBomb* clone() const { return new MrBomb(*this); }
+
protected:
bool collision_squished(Player& player);
protected:
bool collision_squished(Player& player);
- bool set_direction;
- Direction initial_direction;
};
#endif
};
#endif
-