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

gameflow: mark stop_cine as legacy

Browse source
This commit is contained in:
Marcin Kurczewski 2024-02-19 10:04:03 +01:00
parent 7d7e619f52
commit 2f8fe72e98
4 changed files with 2 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
GAMEFLOW.md
View file

@ -814,13 +814,6 @@ default gameflow for examples.
<td colspan="2" align="center">N/A</td>
<td>Starts a new level.</td>
</tr>
<tr valign="top">
<td>
<code>stop_cine</code>
</td>
<td colspan="2" align="center">N/A</td>
<td>Ends a cinematic level.</td>
</tr>
<tr valign="top">
<td>
<code>stop_game</code>
@ -960,7 +953,6 @@ game will exit to title.
{"type": "set_cam_angle", "value": -23312},
{"type": "play_synced_audio", "audio_id": 23},
{"type": "loop_cine"},
{"type": "stop_cine"},
{"type": "level_stats", "level_id": 4},
{"type": "exit_to_level", "level_id": 5},
],

4
bin/cfg/TR1X_gameflow.json5
View file

@ -444,7 +444,6 @@
{"type": "set_cam_angle", "value": -23312},
{"type": "play_synced_audio", "audio_id": 23},
{"type": "loop_cine"},
{"type": "stop_cine"},
{"type": "level_stats", "level_id": 4},
{"type": "exit_to_level", "level_id": 5},
],
@ -472,7 +471,6 @@
{"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 1},
{"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 4},
{"type": "loop_cine"},
{"type": "stop_cine"},
{"type": "level_stats", "level_id": 9},
{"type": "exit_to_level", "level_id": 10},
],
@ -492,7 +490,6 @@
{"type": "set_cam_angle", "value": 16384},
{"type": "play_synced_audio", "audio_id": 24},
{"type": "loop_cine"},
{"type": "stop_cine"},
{"type": "exit_to_level", "level_id": 14},
],
"strings": {},
@ -520,7 +517,6 @@
{"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 1},
{"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 4},
{"type": "loop_cine"},
{"type": "stop_cine"},
{"type": "level_stats", "level_id": 14},
{"type": "exit_to_level", "level_id": 15},
],

14
src/game/gameflow.c
View file

@ -359,7 +359,8 @@ static bool GameFlow_LoadScriptGameStrings(struct json_object_s *obj)
static bool GameFlow_IsLegacySequence(const char *type_str)
{
return !strcmp(type_str, "fix_pyramid_secret");
return !strcmp(type_str, "fix_pyramid_secret")
|| !strcmp(type_str, "stop_cine");
}
static bool GameFlow_LoadLevelSequence(
@ -408,10 +409,6 @@ static bool GameFlow_LoadLevelSequence(
seq->type = GFS_START_CINE;
seq->data = (void *)(intptr_t)level_num;
} else if (!strcmp(type_str, "stop_cine")) {
seq->type = GFS_STOP_CINE;
seq->data = (void *)(intptr_t)level_num;
} else if (!strcmp(type_str, "loop_cine")) {
seq->type = GFS_LOOP_CINE;
seq->data = (void *)(intptr_t)level_num;
@ -1133,7 +1130,6 @@ void GameFlow_Shutdown(void)
case GFS_STOP_GAME:
case GFS_START_CINE:
case GFS_LOOP_CINE:
case GFS_STOP_CINE:
case GFS_LEVEL_STATS:
case GFS_EXIT_TO_TITLE:
case GFS_EXIT_TO_LEVEL:
@ -1295,9 +1291,6 @@ GameFlow_InterpretSequence(int32_t level_num, GAMEFLOW_LEVEL_TYPE level_type)
}
break;
case GFS_STOP_CINE:
break;
case GFS_PLAY_FMV:
if (level_type != GFL_SAVED) {
FMV_Play((char *)seq->data);
@ -1509,9 +1502,6 @@ GameFlow_StorySoFar(int32_t level_num, int32_t savegame_level)
ret = Game_Loop();
break;
case GFS_STOP_CINE:
break;
case GFS_PLAY_FMV:
FMV_Play((char *)seq->data);
break;

1
src/global/types.h
View file

@ -984,7 +984,6 @@ typedef enum GAMEFLOW_SEQUENCE_TYPE {
GFS_STOP_GAME,
GFS_START_CINE,
GFS_LOOP_CINE,
GFS_STOP_CINE,
GFS_PLAY_FMV,
GFS_LEVEL_STATS,
GFS_TOTAL_STATS,