X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fcamera.cpp;h=1b6038673d05f44d0b0ce303e587de8f3f7f7d76;hb=626ab69641b179048b9d0fc528cd1626886fe9db;hp=367030aa51b32913d48802a85b1ed5ec0acde1dc;hpb=62ff7f7776875e9389d10ae2e7b6348e9e5cb9c7;p=supertux.git diff --git a/src/object/camera.cpp b/src/object/camera.cpp index 367030aa5..1b6038673 100644 --- a/src/object/camera.cpp +++ b/src/object/camera.cpp @@ -32,6 +32,7 @@ #include "gameloop.h" #include "app/globals.h" #include "sector.h" +#include "object_factory.h" using namespace SuperTux; @@ -177,7 +178,7 @@ Camera::scroll_normal(float elapsed_time) /****** Vertical Scrolling part ******/ bool do_y_scrolling = true; - if(player->dying || sector->solids->get_height() == 19) + if(player->is_dying() || sector->solids->get_height() == 19) do_y_scrolling = false; if(do_y_scrolling) { @@ -259,7 +260,7 @@ Camera::scroll_autoscroll(float elapsed_time) { Player* player = sector->player; - if(player->dying) + if(player->is_dying()) return; if(auto_t - elapsed_time >= 0) { @@ -289,3 +290,4 @@ Camera::scroll_autoscroll(float elapsed_time) keep_in_bounds(); } +