projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
don't remove trampolines twice
[supertux.git]
/
src
/
scene.cpp
diff --git
a/src/scene.cpp
b/src/scene.cpp
index
d7034a9
..
ccdce0b
100644
(file)
--- a/
src/scene.cpp
+++ b/
src/scene.cpp
@@
-69,7
+69,7
@@
PlayerStatus::BonusType string_to_bonus(const std::string& str)
}
// FIXME: Move this into a view class
-float scroll_x;
+float scroll_x
, scroll_y
;
unsigned int global_frame_counter;