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
/
fish.hpp
diff --git
a/src/badguy/fish.hpp
b/src/badguy/fish.hpp
index
af8b1a8
..
fa36dee
100644
(file)
--- a/
src/badguy/fish.hpp
+++ b/
src/badguy/fish.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,11
@@
// 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 __FISH_H__
#define __FISH_H__
#ifndef __FISH_H__
#define __FISH_H__
@@
-26,19
+26,30
@@
class Fish : public BadGuy
{
public:
Fish(const lisp::Lisp& );
{
public:
Fish(const lisp::Lisp& );
- Fish(float , float );
+ Fish(const Vector& pos);
+
+ void draw(DrawingContext& context);
-
HitResponse collision_solid(GameObject& , const CollisionHit&
);
+
void collision_solid(const CollisionHit& hit
);
HitResponse collision_badguy(BadGuy& , const CollisionHit& );
HitResponse collision_badguy(BadGuy& , const CollisionHit& );
+ void collision_tile(uint32_t tile_attributes);
void write(lisp::Writer& );
void active_update(float);
void write(lisp::Writer& );
void active_update(float);
+ void freeze();
+ void unfreeze();
+ bool is_freezable() const;
+
+ virtual Fish* clone() const { return new Fish(*this); }
+
private:
HitResponse hit(const CollisionHit& );
private:
HitResponse hit(const CollisionHit& );
- bool waiting;
- float waiting_for;
void start_waiting();
void start_waiting();
+ void jump();
+
+ Timer waiting;
+ float stop_y; /**< y-coordinate to stop at */
};
#endif
};
#endif