From 281ccf4b7ac68fbf961891fc5ff73a0607ff14ff Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Mon, 30 Sep 2024 16:19:36 +0200 Subject: [PATCH] gameflow: fix infinite loop in story so far Resolves #1551. --- CHANGELOG.md | 1 + src/game/gameflow.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16fc6eb796..9193d39dbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - fixed really fast typing in console sometimes losing the first input (regression from 4.4) - fixed Lara's head not matching the braid if in use when she is killed by the T-rex (#1549) - fixed `/endlevel` displaying a success message in the title screen +- fixed Story So Far feature looping cutscenes forever (#1551, regression from 4.4) - improved object name matching in console commands to work like TR2X ## [4.4](https://github.com/LostArtefacts/TR1X/compare/4.3-102-g458cd96...4.4) - 2024-09-20 diff --git a/src/game/gameflow.c b/src/game/gameflow.c index de37a1713f..bc32f36ceb 100644 --- a/src/game/gameflow.c +++ b/src/game/gameflow.c @@ -1327,7 +1327,8 @@ GameFlow_StorySoFar(int32_t level_num, int32_t savegame_level) case GFS_LOOP_CINE: command = Phase_Run(); - if (command.action != GF_CONTINUE_SEQUENCE) { + if (command.action != GF_CONTINUE_SEQUENCE + && command.action != GF_LEVEL_COMPLETE) { return command; } break;