projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched from tinygettext/tags/tinygetext-supertux/ to tinygettext/trunk/
[supertux.git]
/
src
/
object
/
trampoline.cpp
diff --git
a/src/object/trampoline.cpp
b/src/object/trampoline.cpp
index
bd6c2b8
..
e097dcd
100644
(file)
--- a/
src/object/trampoline.cpp
+++ b/
src/object/trampoline.cpp
@@
-22,6
+22,7
@@
#include "sprite/sprite.hpp"
#include "sprite/sprite_manager.hpp"
#include "supertux/object_factory.hpp"
#include "sprite/sprite.hpp"
#include "sprite/sprite_manager.hpp"
#include "supertux/object_factory.hpp"
+#include "util/reader.hpp"
/* Trampoline will accelerate player to to VY_INITIAL, if
* he jumps on it to VY_MIN. */
/* Trampoline will accelerate player to to VY_INITIAL, if
* he jumps on it to VY_MIN. */
@@
-31,12
+32,12
@@
const float VY_MIN = -900; //negative, upwards
const float VY_INITIAL = -500;
}
const float VY_INITIAL = -500;
}
-Trampoline::Trampoline(const Reader& lisp)
- : Rock(lisp, "images/objects/trampoline/trampoline.sprite")
+Trampoline::Trampoline(const Reader& lisp) :
+ Rock(lisp, "images/objects/trampoline/trampoline.sprite"),
+ portable(true)
{
sound_manager->preload(TRAMPOLINE_SOUND);
{
sound_manager->preload(TRAMPOLINE_SOUND);
- portable = true;
//Check if this trampoline is not portable
if(lisp.get("portable", portable)) {
if(!portable) {
//Check if this trampoline is not portable
if(lisp.get("portable", portable)) {
if(!portable) {