projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ee229cc
)
fix
author
Matthias Braun
<matze@braunis.de>
Sun, 22 Jan 2006 15:51:38 +0000
(15:51 +0000)
committer
Matthias Braun
<matze@braunis.de>
Sun, 22 Jan 2006 15:51:38 +0000
(15:51 +0000)
SVN-Revision: 3020
src/object/camera.cpp
patch
|
blob
|
history
diff --git
a/src/object/camera.cpp
b/src/object/camera.cpp
index
f33215a
..
5afd926
100644
(file)
--- a/
src/object/camera.cpp
+++ b/
src/object/camera.cpp
@@
-62,7
+62,6
@@
Camera::parse(const lisp::Lisp& reader)
do_backscrolling = true;
reader.get("backscrolling", do_backscrolling);
} else if(modename == "autoscroll") {
- printf("autoscroll.\n");
mode = AUTOSCROLL;
const lisp::Lisp* path_lisp = reader.get_lisp("path");
@@
-341,6
+340,6
@@
Camera::update_scroll_to(float elapsed_time)
return;
}
- translation = (scroll_goal - scroll_from) * scroll_to_pos;
+ translation =
scroll_from +
(scroll_goal - scroll_from) * scroll_to_pos;
}