projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed Kirby badguy code, use simple sprite replacement in the level instead
[supertux.git]
/
src
/
badguy
/
spidermite.cpp
diff --git
a/src/badguy/spidermite.cpp
b/src/badguy/spidermite.cpp
index
8ea7e74
..
b3e5280
100644
(file)
--- a/
src/badguy/spidermite.cpp
+++ b/
src/badguy/spidermite.cpp
@@
-1,12
+1,10
@@
-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// SuperTux
// Copyright (C) 2006 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
-//
as published by the Free Software Foundation; either version 2
-//
of the License, or
(at your option) any later version.
+// This program is free software
: you can redistribute it and/or modify
+//
it under the terms of the GNU General Public License as published by
+//
the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,46
+12,39
@@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include <config.h>
-#include <stdio.h>
+#include "badguy/spidermite.hpp"
-#include "spidermite.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
static const float FLYTIME = 1.2f;
static const float FLYTIME = 1.2f;
-static const float
FLY
SPEED = -100.0f;
+static const float
MOVE_
SPEED = -100.0f;
-SpiderMite::SpiderMite(const lisp::Lisp& reader)
- : BadGuy(reader, "images/creatures/spidermite/spidermite.sprite")
+SpiderMite::SpiderMite(const Reader& reader) :
+ BadGuy(reader, "images/creatures/spidermite/spidermite.sprite"),
+ mode(),
+ timer()
{
physic.enable_gravity(false);
}
{
physic.enable_gravity(false);
}
-SpiderMite::SpiderMite(const Vector& pos)
- : BadGuy(pos, "images/creatures/spidermite/spidermite.sprite")
+SpiderMite::SpiderMite(const Vector& pos) :
+ BadGuy(pos, "images/creatures/spidermite/spidermite.sprite"),
+ mode(),
+ timer()
{
physic.enable_gravity(false);
}
void
{
physic.enable_gravity(false);
}
void
-SpiderMite::write(lisp::Writer& writer)
-{
- writer.start_list("spidermite");
-
- writer.write_float("x", start_position.x);
- writer.write_float("y", start_position.y);
-
- writer.end_list("spidermite");
-}
-
-void
SpiderMite::initialize()
{
sprite->set_action(dir == LEFT ? "left" : "right");
mode = FLY_UP;
SpiderMite::initialize()
{
sprite->set_action(dir == LEFT ? "left" : "right");
mode = FLY_UP;
- physic.set_velocity_y(
FLY
SPEED);
+ physic.set_velocity_y(
MOVE_
SPEED);
timer.start(FLYTIME/2);
}
timer.start(FLYTIME/2);
}
@@
-76,13
+67,18
@@
SpiderMite::collision_solid(const CollisionHit& hit)
void
SpiderMite::active_update(float elapsed_time)
{
void
SpiderMite::active_update(float elapsed_time)
{
+ if(frozen)
+ {
+ BadGuy::active_update(elapsed_time);
+ return;
+ }
if(timer.check()) {
if(mode == FLY_UP) {
mode = FLY_DOWN;
if(timer.check()) {
if(mode == FLY_UP) {
mode = FLY_DOWN;
- physic.set_velocity_y(-
FLY
SPEED);
+ physic.set_velocity_y(-
MOVE_
SPEED);
} else if(mode == FLY_DOWN) {
mode = FLY_UP;
} else if(mode == FLY_DOWN) {
mode = FLY_UP;
- physic.set_velocity_y(
FLY
SPEED);
+ physic.set_velocity_y(
MOVE_
SPEED);
}
timer.start(FLYTIME);
}
}
timer.start(FLYTIME);
}
@@
-95,4
+91,25
@@
SpiderMite::active_update(float elapsed_time)
}
}
}
}
-IMPLEMENT_FACTORY(SpiderMite, "spidermite")
+void
+SpiderMite::freeze()
+{
+ physic.enable_gravity(true);
+ BadGuy::freeze();
+}
+
+void
+SpiderMite::unfreeze()
+{
+ BadGuy::unfreeze();
+ physic.enable_gravity(false);
+ initialize();
+}
+
+bool
+SpiderMite::is_freezable() const
+{
+ return true;
+}
+
+/* EOF */