From bb73b063173c01e586d4dc97f6736db3b472f4ea Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 23 Jul 2018 22:09:36 +0200 Subject: [PATCH] Camera shot progression is now reset when PC_Hero is shown, to mimic original camera behaviour more closely --- src/logic/CameraController.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/logic/CameraController.cpp b/src/logic/CameraController.cpp index 45061aae..bbf450f2 100644 --- a/src/logic/CameraController.cpp +++ b/src/logic/CameraController.cpp @@ -264,15 +264,21 @@ void Logic::CameraController::nextDialogueShot() { } } else { // Rule: A close-up is the only possible option after a neutral shot - if (m_DialogueShotType == EDialogueShotType::Neutral && rand() % 4 == 0) + if (m_DialogueShotType == EDialogueShotType::Neutral && rand() % 4 == 0) { nextShot = EDialogueShotType::CloseUp; // Rule: No shot should come after a close-up - else if (m_DialogueShotType != EDialogueShotType::CloseUp) + } else if (m_DialogueShotType != EDialogueShotType::CloseUp) { nextShot = (EDialogueShotType) (rand() % 4); + } } m_DialogueShotType = nextShot; - m_CameraSettings.dialogueCameraSettings.dialogueShotCounter++; + + if (playerTalking) { + resetCameraProgression(); + } else { + m_CameraSettings.dialogueCameraSettings.dialogueShotCounter++; + } } void Logic::CameraController::updateDialogueCamera() {