projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/
[supertux.git]
/
src
/
badguy
/
bouncing_snowball.cpp
diff --git
a/src/badguy/bouncing_snowball.cpp
b/src/badguy/bouncing_snowball.cpp
index
37aefb4
..
2328841
100644
(file)
--- a/
src/badguy/bouncing_snowball.cpp
+++ b/
src/badguy/bouncing_snowball.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,22
+12,18
@@
// 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.
-
-#include <config.h>
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "bouncing_snowball.hpp"
+#include "b
adguy/b
ouncing_snowball.hpp"
-#include "lisp/writer.hpp"
-#include "object_factory.hpp"
#include "sprite/sprite.hpp"
#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
static const float JUMPSPEED = -450;
static const float WALKSPEED = 80;
static const float JUMPSPEED = -450;
static const float WALKSPEED = 80;
-BouncingSnowball::BouncingSnowball(const
lisp::Lisp
& reader)
-
: BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
+BouncingSnowball::BouncingSnowball(const
Reader
& reader)
+ : BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
{
}
{
}
@@
-39,17
+33,6
@@
BouncingSnowball::BouncingSnowball(const Vector& pos, Direction d)
}
void
}
void
-BouncingSnowball::write(lisp::Writer& writer)
-{
- writer.start_list("bouncingsnowball");
-
- writer.write("x", start_position.x);
- writer.write("y", start_position.y);
-
- writer.end_list("bouncingsnowball");
-}
-
-void
BouncingSnowball::initialize()
{
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
BouncingSnowball::initialize()
{
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
@@
-91,4
+74,6
@@
BouncingSnowball::collision_badguy(BadGuy& , const CollisionHit& hit)
return CONTINUE;
}
return CONTINUE;
}
-IMPLEMENT_FACTORY(BouncingSnowball, "bouncingsnowball")
+IMPLEMENT_FACTORY(BouncingSnowball, "bouncingsnowball");
+
+/* EOF */