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
/
plant.hpp
diff --git
a/src/badguy/plant.hpp
b/src/badguy/plant.hpp
index
311e8a7
..
97aea8b
100644
(file)
--- a/
src/badguy/plant.hpp
+++ b/
src/badguy/plant.hpp
@@
-1,7
+1,7
@@
-// $Id
: plant.hpp 2642 2005-06-26 13:38:53Z matzebraun
$
-//
+// $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 __PLANT_H__
#define __PLANT_H__
#ifndef __PLANT_H__
#define __PLANT_H__
@@
-28,12
+27,14
@@
class Plant : public BadGuy
public:
Plant(const lisp::Lisp& reader);
public:
Plant(const lisp::Lisp& reader);
- void
activat
e();
+ void
initializ
e();
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
-
HitResponse collision_solid(GameObject& other,
const CollisionHit& hit);
+
void collision_solid(
const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
void active_update(float elapsed_time);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
void active_update(float elapsed_time);
+ virtual Plant* clone() const { return new Plant(*this); }
+
protected:
Timer timer;
protected:
Timer timer;
@@
-43,7
+44,7
@@
protected:
PLANT_WALKING
};
PlantState state;
PLANT_WALKING
};
PlantState state;
-
+
};
#endif
};
#endif