abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Atlas camera controls should be disabled too if a cinematic path is paused.

Browse Source 
Reviewed By: Vladislav
This was SVN commit r19376.
This commit is contained in:
elexis 2017-04-05 04:00:19 +00:00
parent 5d49e6c456
commit ffea346abb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/tools/atlas/GameInterface/Handlers/CameraCtrlHandlers.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2017 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -38,7 +38,7 @@ namespace AtlasMessage {
MESSAGEHANDLER(CameraReset)
{
if (!g_Game || g_Game->GetView()->GetCinema()->IsPlaying())
if (!g_Game || g_Game->GetView()->GetCinema()->IsEnabled())
return;
CVector3D focus = g_Game->GetView()->GetCamera()->GetFocus();
@ -63,7 +63,7 @@ MESSAGEHANDLER(CameraReset)
MESSAGEHANDLER(ScrollConstant)
{
if (!g_Game || g_Game->GetView()->GetCinema()->IsPlaying())
if (!g_Game || g_Game->GetView()->GetCinema()->IsEnabled())
return;
if (msg->dir < 0 || msg->dir > 5)
@ -81,7 +81,7 @@ MESSAGEHANDLER(ScrollConstant)
MESSAGEHANDLER(Scroll)
{
if (!g_Game || g_Game->GetView()->GetCinema()->IsPlaying()) // TODO: do this better (probably a separate AtlasView class for cinematics)
if (!g_Game || g_Game->GetView()->GetCinema()->IsEnabled()) // TODO: do this better (probably a separate AtlasView class for cinematics)
return;
static CVector3D targetPos;
@ -131,7 +131,7 @@ MESSAGEHANDLER(Scroll)
MESSAGEHANDLER(SmoothZoom)
{
if (!g_Game || g_Game->GetView()->GetCinema()->IsPlaying())
if (!g_Game || g_Game->GetView()->GetCinema()->IsEnabled())
return;
g_AtlasGameLoop->input.zoomDelta += msg->amount;
@ -139,7 +139,7 @@ MESSAGEHANDLER(SmoothZoom)
MESSAGEHANDLER(RotateAround)
{
if (!g_Game || g_Game->GetView()->GetCinema()->IsPlaying())
if (!g_Game || g_Game->GetView()->GetCinema()->IsEnabled())
return;
static CVector3D focusPos;
@ -245,7 +245,7 @@ QUERYHANDLER(GetView)
MESSAGEHANDLER(SetView)
{
if (!g_Game || g_Game->GetView()->GetCinema()->IsPlaying())
if (!g_Game || g_Game->GetView()->GetCinema()->IsEnabled())
return;
CGameView* view = g_Game->GetView();