projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hardcoded stay-on-platform behaviour as follows: Mr. Bomb, Mr. Tree and the Totem...
[supertux.git]
/
src
/
badguy
/
spidermite.cpp
diff --git
a/src/badguy/spidermite.cpp
b/src/badguy/spidermite.cpp
index
2acd750
..
d8f6970
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,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.
#include <config.h>
#include <stdio.h>
#include <config.h>
#include <stdio.h>
@@
-96,8
+95,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")