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: remove deadly water sequence

Browse source
This commit is contained in:
Marcin Kurczewski 2025-01-22 10:27:37 +01:00
parent a3e27685f4
commit a4c0fffb5d
No known key found for this signature in database
GPG key ID: CC65E6FD28CAE42A
8 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/tr2/ship/cfg/TR2X_gameflow.json5
View file

@ -243,7 +243,6 @@
"path": "data/icecave.tr2",
"sequence": [
{"type": "set_music_track", "music_track": 31},
{"type": "enable_deadly_water"},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 4},
{"type": "play_level", "level_num": 14},
{"type": "level_complete"},

1
src/tr2/game/game_flow/reader.c
View file

@ -77,7 +77,6 @@ static M_SEQUENCE_EVENT_HANDLER m_SequenceEventHandlers[] = {
// clang-format off
// Events without arguments
{ GFS_ENABLE_SUNSET, NULL, NULL },
{ GFS_ENABLE_DEADLY_WATER, NULL, NULL },
{ GFS_REMOVE_WEAPONS, NULL, NULL },
{ GFS_REMOVE_AMMO, NULL, NULL },
{ GFS_LEVEL_COMPLETE, NULL, NULL },

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

@ -90,7 +90,6 @@ GAME_FLOW_COMMAND GF_InterpretSequence(
const GAME_FLOW_SEQUENCE *sequence, GAME_FLOW_LEVEL_TYPE type)
{
g_GF_NoFloor = 0;
g_GF_DeadlyWater = false;
g_GF_SunsetEnabled = false;
g_GF_LaraStartAnim = 0;
g_GF_RemoveAmmo = false;
@ -236,12 +235,6 @@ GAME_FLOW_COMMAND GF_InterpretSequence(
}
break;
case GFS_ENABLE_DEADLY_WATER:
if (type != GFL_STORY && type != GFL_MID_STORY) {
g_GF_DeadlyWater = true;
}
break;
case GFS_GAME_COMPLETE:
START_INFO *const start = &g_SaveGame.start[g_CurrentLevel];
start->stats = g_SaveGame.current_stats;

1
src/tr2/game/game_flow/types.h
View file

@ -20,7 +20,6 @@ typedef enum {
GFS_SET_START_ANIM,
GFS_DISABLE_FLOOR,
GFS_ENABLE_SUNSET,
GFS_ENABLE_DEADLY_WATER,
GFS_REMOVE_WEAPONS,
GFS_REMOVE_AMMO,
GFS_SET_NUM_SECRETS,

1
src/tr2/global/enum_map.def
View file

@ -15,7 +15,6 @@ ENUM_MAP_DEFINE(ASPECT_MODE, AM_16_9, "16:9")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_PICTURE, "display_picture")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_ENABLE_SUNSET, "enable_sunset")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_ENABLE_DEADLY_WATER, "enable_deadly_water")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_REMOVE_WEAPONS, "remove_weapons")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_REMOVE_AMMO, "remove_ammo")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_LEVEL_COMPLETE, "level_complete")

1
src/tr2/global/vars.c
View file

@ -323,7 +323,6 @@ REQUEST_INFO g_SaveGameRequester = {
.render_height = 0,
};
bool g_GF_DeadlyWater = false;
bool g_GF_RemoveAmmo = false;
bool g_GF_RemoveWeapons = false;
bool g_GF_SunsetEnabled = false;

1
src/tr2/global/vars.h
View file

@ -131,7 +131,6 @@ extern int16_t g_FinalBossItem[5];
extern REQUEST_INFO g_LoadGameRequester;
extern REQUEST_INFO g_SaveGameRequester;
extern bool g_GF_DeadlyWater;
extern bool g_GF_SunsetEnabled;
extern bool g_GF_RemoveAmmo;
extern bool g_GF_RemoveWeapons;

2
tools/tr2/read_tombpc_script
View file

@ -256,7 +256,7 @@ def transform_script(script: list[int]):
}
case GameFlowEvent.DEADLY_WATER:
yield {"type": "enable_deadly_water"}
pass
case GameFlowEvent.REMOVE_WEAPONS:
yield {"type": "remove_weapons"}