Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 12:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tr2/game-flow: add fade-out effect to Gym

Browse source
This commit is contained in:
Marcin Kurczewski 2025-01-27 00:13:14 +01:00
parent c91daa65d8
commit 294ad94f2a
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/tr2/CHANGELOG.md
View file

@ -6,6 +6,7 @@
- added fade-out effect to the demos
- added the ability to hold left/right to move through menus more quickly (#2298)
- added the ability to disable exit fade effects alone (#2348)
- added a fade-out effect when completing Lara's Home
- changed default input bindings to let the photo mode binding be compatible with TR1X:
| Key | Old binding | New binding |
| ----------------------------- | ----------- | ------------ |

3
src/tr2/game/game.c
View file

@ -73,9 +73,6 @@ GAME_FLOW_COMMAND Game_Control(const bool demo_mode)
if (g_GameFlow.is_demo_version && g_GameFlow.single_level) {
return (GAME_FLOW_COMMAND) { .action = GF_EXIT_TO_TITLE };
}
if (Game_IsInGym()) {
return (GAME_FLOW_COMMAND) { .action = GF_EXIT_TO_TITLE };
}
return (GAME_FLOW_COMMAND) { .action = GF_LEVEL_COMPLETE };
}

14
src/tr2/game/game_flow/sequencer.c
View file

@ -55,22 +55,25 @@ GAME_FLOW_COMMAND GF_DoLevelSequence(
{
int32_t current_level = start_level;
while (true) {
if (current_level > GF_GetLevelCount(GFL_NORMAL) - 1) {
if (current_level >= GF_GetLevelCount(type)) {
return (GAME_FLOW_COMMAND) { .action = GF_EXIT_TO_TITLE };
}
LOG_DEBUG("running sequence for level=%d type=%d", current_level, type);
const GAME_FLOW_COMMAND gf_cmd = GF_InterpretSequence(
&GF_GetLevel(current_level, GFL_NORMAL)->sequence, type);
LOG_DEBUG("sequence finished");
LOG_DEBUG("sequence finished: %d", gf_cmd.action);
current_level++;
if (g_GameFlow.single_level >= 0) {
return gf_cmd;
}
if (gf_cmd.action != GF_LEVEL_COMPLETE) {
if (gf_cmd.action != GF_NOOP && gf_cmd.action != GF_LEVEL_COMPLETE) {
return gf_cmd;
}
if (Game_IsInGym()) {
return (GAME_FLOW_COMMAND) { .action = GF_EXIT_TO_TITLE };
}
}
}
@ -139,7 +142,8 @@ GAME_FLOW_COMMAND GF_InterpretSequence(
if (type == GFL_SAVED) {
type = GFL_NORMAL;
}
if (gf_cmd.action != GF_LEVEL_COMPLETE) {
if (gf_cmd.action != GF_NOOP
&& gf_cmd.action != GF_LEVEL_COMPLETE) {
return gf_cmd;
}
}
@ -173,7 +177,7 @@ GAME_FLOW_COMMAND GF_InterpretSequence(
case GFS_LEVEL_STATS: {
const GAME_FLOW_LEVEL *const current_level = Game_GetCurrentLevel();
PHASE *const stats_phase = Phase_Stats_Create((PHASE_STATS_ARGS) {
.background_type = BK_OBJECT,
.background_type = Game_IsInGym() ? BK_TRANSPARENT : BK_OBJECT,
.level_num = current_level->num,
.show_final_stats = false,
.use_bare_style = false,