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
/
rock.cpp
diff --git
a/src/object/rock.cpp
b/src/object/rock.cpp
index
89976dc
..
3daf712
100644
(file)
--- a/
src/object/rock.cpp
+++ b/
src/object/rock.cpp
@@
-25,6
+25,7
@@
const std::string ROCK_SOUND = "sounds/brick.wav"; //TODO use own sound.
Rock::Rock(const Vector& pos, std::string spritename) :
MovingSprite(pos, spritename),
Rock::Rock(const Vector& pos, std::string spritename) :
MovingSprite(pos, spritename),
+ physic(),
on_ground(),
grabbed(),
last_movement()
on_ground(),
grabbed(),
last_movement()
@@
-37,6
+38,7
@@
Rock::Rock(const Vector& pos, std::string spritename) :
Rock::Rock(const Reader& reader) :
MovingSprite(reader, "images/objects/rock/rock.sprite"),
Rock::Rock(const Reader& reader) :
MovingSprite(reader, "images/objects/rock/rock.sprite"),
+ physic(),
on_ground(),
grabbed(),
last_movement()
on_ground(),
grabbed(),
last_movement()
@@
-47,8
+49,12
@@
Rock::Rock(const Reader& reader) :
set_group(COLGROUP_MOVING_STATIC);
}
set_group(COLGROUP_MOVING_STATIC);
}
-Rock::Rock(const Reader& reader, std::string spritename)
- : MovingSprite(reader, spritename)
+Rock::Rock(const Reader& reader, std::string spritename) :
+ MovingSprite(reader, spritename),
+ physic(),
+ on_ground(),
+ grabbed(),
+ last_movement()
{
sound_manager->preload(ROCK_SOUND);
on_ground = false;
{
sound_manager->preload(ROCK_SOUND);
on_ground = false;