--- a/hedgewars/uWorld.pas	Sat Jan 23 11:00:31 2016 +0100
+++ b/hedgewars/uWorld.pas	Sat Jan 23 19:49:55 2016 +0100
@@ -1383,7 +1383,7 @@
 SetScale(cDefaultZoomLevel);
 
 // cinematic effects
-if CinematicScript or (InCinematicMode
+if CinematicScript or (InCinematicMode and autoCameraOn
     and ((CurrentHedgehog = nil) or CurrentHedgehog^.Team^.ExtDriven
     or (CurrentHedgehog^.BotLevel <> 0) or (GameType = gmtDemo))) then
     begin
@@ -1785,7 +1785,7 @@
             WorldDx:= WorldDx + LongInt(rightX) - leftX;
     end;
 
-wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - (cVisibleWater + CinematicBarH);
+wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - (cVisibleWater + trunc(CinematicBarH / (cScaleFactor / 2.0)));
 if WorldDy < wdy then
     WorldDy:= wdy;