projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed MrTree. He uses activate() to change direction which is now working again.
[supertux.git]
/
src
/
badguy
/
snowball.cpp
diff --git
a/src/badguy/snowball.cpp
b/src/badguy/snowball.cpp
index
1db1eb5
..
22dce8e
100644
(file)
--- a/
src/badguy/snowball.cpp
+++ b/
src/badguy/snowball.cpp
@@
-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,33
+12,31
@@
// 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 <config.h>
-#include "snowball.h"
+#include "snowball.h
pp
"
static const float WALKSPEED = 80;
SnowBall::SnowBall(const lisp::Lisp& reader)
static const float WALKSPEED = 80;
SnowBall::SnowBall(const lisp::Lisp& reader)
+ : BadGuy(reader, "images/creatures/snowball/snowball.sprite")
{
{
- reader.get("x", start_position.x);
- reader.get("y", start_position.y);
- bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("snowball");
set_direction = false;
set_direction = false;
+ reader.get("direction", direction);
+ if( direction != "auto" && direction != ""){
+ set_direction = true;
+ initial_direction = str2dir( direction );
+ }
}
}
-SnowBall::SnowBall(float pos_x, float pos_y, Direction d)
+SnowBall::SnowBall(const Vector& pos, Direction d)
+ : BadGuy(pos, "images/creatures/snowball/snowball.sprite")
{
{
- start_position.x = pos_x;
- start_position.y = pos_y;
- bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("snowball");
set_direction = true;
initial_direction = d;
}
set_direction = true;
initial_direction = d;
}
@@
-48,9
+46,14
@@
SnowBall::write(lisp::Writer& writer)
{
writer.start_list("snowball");
{
writer.start_list("snowball");
+ writer.write_string("direction", direction);
writer.write_float("x", start_position.x);
writer.write_float("y", start_position.y);
writer.write_float("x", start_position.x);
writer.write_float("y", start_position.y);
-
+ /*
+ if (fluffy) { // don't give us away at every snowball
+ writer.write_bool("fluffy", true);
+ }
+ */
writer.end_list("snowball");
}
writer.end_list("snowball");
}