projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set 'licence' attribute on sound files
[supertux.git]
/
src
/
badguy
/
skullyhop.cpp
diff --git
a/src/badguy/skullyhop.cpp
b/src/badguy/skullyhop.cpp
index
8bf61d7
..
258adec
100644
(file)
--- a/
src/badguy/skullyhop.cpp
+++ b/
src/badguy/skullyhop.cpp
@@
-1,7
+1,7
@@
// $Id$
//
// SkullyHop - A Hopping Skull
// $Id$
//
// SkullyHop - A Hopping Skull
-// Copyright (C) 2006 Christoph Sommer <
supertux
@2006.expires.deltadevelopment.de>
+// Copyright (C) 2006 Christoph Sommer <
christoph.sommer
@2006.expires.deltadevelopment.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
@@
-21,23
+21,27
@@
#include "skullyhop.hpp"
#include "random_generator.hpp"
#include "skullyhop.hpp"
#include "random_generator.hpp"
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
+#include "audio/sound_manager.hpp"
+#include "sprite/sprite.hpp"
namespace {
const float VERTICAL_SPEED = -450; /**< y-speed when jumping */
const float HORIZONTAL_SPEED = 220; /**< x-speed when jumping */
namespace {
const float VERTICAL_SPEED = -450; /**< y-speed when jumping */
const float HORIZONTAL_SPEED = 220; /**< x-speed when jumping */
- const float MIN_RECOVER_TIME = 0.1; /**< minimum time to stand still before starting a (new) jump */
- const float MAX_RECOVER_TIME = 1.0; /**< maximum time to stand still before starting a (new) jump */
+ const float MIN_RECOVER_TIME = 0.1
f
; /**< minimum time to stand still before starting a (new) jump */
+ const float MAX_RECOVER_TIME = 1.0
f
; /**< maximum time to stand still before starting a (new) jump */
static const std::string HOP_SOUND = "sounds/hop.ogg";
}
SkullyHop::SkullyHop(const lisp::Lisp& reader)
static const std::string HOP_SOUND = "sounds/hop.ogg";
}
SkullyHop::SkullyHop(const lisp::Lisp& reader)
- : BadGuy(reader, "images/creatures/skullyhop/skullyhop.sprite")
+
: BadGuy(reader, "images/creatures/skullyhop/skullyhop.sprite")
{
sound_manager->preload( HOP_SOUND );
}
SkullyHop::SkullyHop(const Vector& pos, Direction d)
{
sound_manager->preload( HOP_SOUND );
}
SkullyHop::SkullyHop(const Vector& pos, Direction d)
- : BadGuy(pos, d, "images/creatures/skullyhop/skullyhop.sprite")
+
: BadGuy(pos, d, "images/creatures/skullyhop/skullyhop.sprite")
{
sound_manager->preload( HOP_SOUND );
}
{
sound_manager->preload( HOP_SOUND );
}
@@
-46,13
+50,13
@@
void
SkullyHop::write(lisp::Writer& writer)
{
writer.start_list("skullyhop");
SkullyHop::write(lisp::Writer& writer)
{
writer.start_list("skullyhop");
- writer.write
_float
("x", start_position.x);
- writer.write
_float
("y", start_position.y);
+ writer.write("x", start_position.x);
+ writer.write("y", start_position.y);
writer.end_list("skullyhop");
}
void
writer.end_list("skullyhop");
}
void
-SkullyHop::
activat
e()
+SkullyHop::
initializ
e()
{
// initial state is JUMPING, because we might start airborne
state = JUMPING;
{
// initial state is JUMPING, because we might start airborne
state = JUMPING;