projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issue with action not being updated when typing grow()/fire()/etc in console...
[supertux.git]
/
src
/
object
/
camera.cpp
diff --git
a/src/object/camera.cpp
b/src/object/camera.cpp
index
6833987
..
7cea284
100644
(file)
--- a/
src/object/camera.cpp
+++ b/
src/object/camera.cpp
@@
-266,7
+266,7
@@
Camera::reload_config()
config->load("camera.cfg");
} catch(std::exception &e) {
log_debug << "Couldn't load camera.cfg, using defaults ("
config->load("camera.cfg");
} catch(std::exception &e) {
log_debug << "Couldn't load camera.cfg, using defaults ("
- << e.what() << ")";
+ << e.what() << ")"
<< std::endl
;
}
}
}
}
@@
-310,7
+310,8
@@
Camera::update_scroll_normal(float elapsed_time)
{
const CameraConfig& config = *(this->config);
Player* player = sector->player;
{
const CameraConfig& config = *(this->config);
Player* player = sector->player;
- const Vector& player_pos = player->get_bbox().get_middle();
+ const Vector& player_pos = Vector(player->get_bbox().get_middle().x,
+ player->get_bbox().get_bottom());
static Vector last_player_pos = player_pos;
Vector player_delta = player_pos - last_player_pos;
last_player_pos = player_pos;
static Vector last_player_pos = player_pos;
Vector player_delta = player_pos - last_player_pos;
last_player_pos = player_pos;