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
/
spidermite.cpp
diff --git
a/src/badguy/spidermite.cpp
b/src/badguy/spidermite.cpp
index
7e475d7
..
8ea7e74
100644
(file)
--- a/
src/badguy/spidermite.cpp
+++ b/
src/badguy/spidermite.cpp
@@
-1,7
+1,7
@@
-// $Id
: flyingsnowball.cpp 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,35
+12,28
@@
// 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.
#include <config.h>
#include <stdio.h>
#include "spidermite.hpp"
#include <config.h>
#include <stdio.h>
#include "spidermite.hpp"
-static const float FLYTIME = 1.2;
-static const float FLYSPEED =
100.0
;
+static const float FLYTIME = 1.2
f
;
+static const float FLYSPEED =
-100.0f
;
SpiderMite::SpiderMite(const lisp::Lisp& reader)
SpiderMite::SpiderMite(const lisp::Lisp& reader)
+ : BadGuy(reader, "images/creatures/spidermite/spidermite.sprite")
{
{
- reader.get("x", start_position.x);
- reader.get("y", start_position.y);
- bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("spidermite");
physic.enable_gravity(false);
}
physic.enable_gravity(false);
}
-SpiderMite::SpiderMite(float pos_x, float pos_y)
+SpiderMite::SpiderMite(const Vector& pos)
+ : BadGuy(pos, "images/creatures/spidermite/spidermite.sprite")
{
{
- start_position.x = pos_x;
- start_position.y = pos_y;
- bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("spidermite");
physic.enable_gravity(false);
}
physic.enable_gravity(false);
}
@@
-55,8
+48,8
@@
SpiderMite::write(lisp::Writer& writer)
writer.end_list("spidermite");
}
writer.end_list("spidermite");
}
-void
-SpiderMite::
activat
e()
+void
+SpiderMite::
initializ
e()
{
sprite->set_action(dir == LEFT ? "left" : "right");
mode = FLY_UP;
{
sprite->set_action(dir == LEFT ? "left" : "right");
mode = FLY_UP;
@@
-65,25
+58,23
@@
SpiderMite::activate()
}
bool
}
bool
-SpiderMite::collision_squished(
Player& player
)
+SpiderMite::collision_squished(
GameObject& object
)
{
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
{
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
- kill_squished(
player
);
+ kill_squished(
object
);
return true;
}
return true;
}
-HitResponse
-SpiderMite::collision_solid(
GameObject& ,
const CollisionHit& hit)
+void
+SpiderMite::collision_solid(const CollisionHit& hit)
{
{
- if(
fabsf(hit.normal.y) > 1.5
) { // hit floor or roof?
+ if(
hit.top || hit.bottom
) { // hit floor or roof?
physic.set_velocity_y(0);
}
physic.set_velocity_y(0);
}
-
- return CONTINUE;
}
void
}
void
-SpiderMite::active_update(float elapsed_time)
+SpiderMite::active_update(float elapsed_time)
{
if(timer.check()) {
if(mode == FLY_UP) {
{
if(timer.check()) {
if(mode == FLY_UP) {
@@
-96,8
+87,12
@@
SpiderMite::active_update(float elapsed_time)
timer.start(FLYTIME);
}
movement=physic.get_movement(elapsed_time);
timer.start(FLYTIME);
}
movement=physic.get_movement(elapsed_time);
- dir= Sector::current()->player->get_pos().x>get_pos().x?RIGHT:LEFT;
- sprite->set_action(dir == LEFT ? "left" : "right");
+
+ Player* player = this->get_nearest_player();
+ if (player) {
+ dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
+ sprite->set_action(dir == LEFT ? "left" : "right");
+ }
}
IMPLEMENT_FACTORY(SpiderMite, "spidermite")
}
IMPLEMENT_FACTORY(SpiderMite, "spidermite")