projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made trampolines less likely to interfere with level design:
[supertux.git]
/
src
/
badguy
/
mrrocket.hpp
diff --git
a/src/badguy/mrrocket.hpp
b/src/badguy/mrrocket.hpp
index
fe4658e
..
77a7634
100644
(file)
--- a/
src/badguy/mrrocket.hpp
+++ b/
src/badguy/mrrocket.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,11
+12,10
@@
// 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 __MRROCKET_H__
#define __MRROCKET_H__
#ifndef __MRROCKET_H__
#define __MRROCKET_H__
@@
-29,17
+28,17
@@
class MrRocket : public BadGuy
{
public:
MrRocket(const lisp::Lisp& reader);
{
public:
MrRocket(const lisp::Lisp& reader);
- MrRocket(
float pos_x, float pos_y
, Direction d);
+ MrRocket(
const Vector& pos
, Direction d);
void activate();
void active_update(float elapsed_time);
void write(lisp::Writer& writer);
void activate();
void active_update(float elapsed_time);
void write(lisp::Writer& writer);
- HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+ void collision_solid(const CollisionHit& hit);
+
+ virtual MrRocket* clone() const { return new MrRocket(*this); }
protected:
bool collision_squished(Player& player);
protected:
bool collision_squished(Player& player);
- bool set_direction;
- Direction initial_direction;
Timer collision_timer;
};
Timer collision_timer;
};