projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more aspect ratio stuff
[supertux.git]
/
src
/
badguy
/
flyingsnowball.hpp
diff --git
a/src/badguy/flyingsnowball.hpp
b/src/badguy/flyingsnowball.hpp
index
2058e21
..
d82740f
100644
(file)
--- a/
src/badguy/flyingsnowball.hpp
+++ b/
src/badguy/flyingsnowball.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 __FLYINGSNOWBALL_H__
#define __FLYINGSNOWBALL_H__
#ifndef __FLYINGSNOWBALL_H__
#define __FLYINGSNOWBALL_H__
@@
-27,22
+26,21
@@
class FlyingSnowBall : public BadGuy
{
public:
FlyingSnowBall(const lisp::Lisp& reader);
{
public:
FlyingSnowBall(const lisp::Lisp& reader);
- FlyingSnowBall(
float pos_x, float pos_y
);
+ FlyingSnowBall(
const Vector& pos
);
+ void initialize();
void activate();
void write(lisp::Writer& writer);
void active_update(float elapsed_time);
void activate();
void write(lisp::Writer& writer);
void active_update(float elapsed_time);
- HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+ void collision_solid(const CollisionHit& hit);
+
+ virtual FlyingSnowBall* clone() const { return new FlyingSnowBall(*this); }
+
protected:
protected:
- enum FlyingSnowballMode {
- FLY_UP,
- FLY_DOWN
- };
- FlyingSnowballMode mode;
- bool collision_squished(Player& player);
+ bool collision_squished(GameObject& object);
private:
private:
- Timer timer;
+ float normal_propeller_speed;
+ Timer puff_timer; /**< time until the next smoke puff is spawned */
};
#endif
};
#endif
-