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

tr1/game-flow: remove set cam pos sequence events

Browse source
This commit is contained in:
Marcin Kurczewski 2025-01-22 23:20:09 +01:00
parent 1df5d5e3d4
commit 718a1d7021
6 changed files with 0 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/tr1/ship/cfg/TR1X_gameflow.json5
View file

@ -404,8 +404,6 @@
], ],
"sequence": [ "sequence": [
{"type": "start_cine"}, {"type": "start_cine"},
{"type": "set_cam_x", "value": 36668},
{"type": "set_cam_z", "value": 63180},
{"type": "set_cam_angle", "value": -23312}, {"type": "set_cam_angle", "value": -23312},
{"type": "play_synced_audio", "audio_id": 23}, {"type": "play_synced_audio", "audio_id": 23},
{"type": "loop_cine"}, {"type": "loop_cine"},
@ -429,8 +427,6 @@
], ],
"sequence": [ "sequence": [
{"type": "start_cine"}, {"type": "start_cine"},
{"type": "set_cam_x", "value": 51962},
{"type": "set_cam_z", "value": 53760},
{"type": "set_cam_angle", "value": 16380}, {"type": "set_cam_angle", "value": 16380},
{"type": "play_synced_audio", "audio_id": 25}, {"type": "play_synced_audio", "audio_id": 25},
{"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 1}, {"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 1},

3
src/tr1/game/game_flow/common.c
View file

@ -34,9 +34,6 @@ static void M_FreeSequence(GAME_FLOW_SEQUENCE *const sequence)
case GFS_EXIT_TO_TITLE: case GFS_EXIT_TO_TITLE:
case GFS_EXIT_TO_LEVEL: case GFS_EXIT_TO_LEVEL:
case GFS_EXIT_TO_CINE: case GFS_EXIT_TO_CINE:
case GFS_SET_CAM_X:
case GFS_SET_CAM_Y:
case GFS_SET_CAM_Z:
case GFS_SET_CAM_ANGLE: case GFS_SET_CAM_ANGLE:
case GFS_FLIP_MAP: case GFS_FLIP_MAP:
case GFS_PLAY_SYNCED_AUDIO: case GFS_PLAY_SYNCED_AUDIO:

3
src/tr1/game/game_flow/enum.h
View file

@ -14,9 +14,6 @@ typedef enum {
GFS_EXIT_TO_TITLE, GFS_EXIT_TO_TITLE,
GFS_EXIT_TO_LEVEL, GFS_EXIT_TO_LEVEL,
GFS_EXIT_TO_CINE, GFS_EXIT_TO_CINE,
GFS_SET_CAM_X,
GFS_SET_CAM_Y,
GFS_SET_CAM_Z,
GFS_SET_CAM_ANGLE, GFS_SET_CAM_ANGLE,
GFS_FLIP_MAP, GFS_FLIP_MAP,
GFS_REMOVE_GUNS, GFS_REMOVE_GUNS,

3
src/tr1/game/game_flow/reader.c
View file

@ -257,9 +257,6 @@ static bool M_LoadLevelSequence(JSON_OBJECT *obj, int32_t level_num)
break; break;
} }
case GFS_SET_CAM_X:
case GFS_SET_CAM_Y:
case GFS_SET_CAM_Z:
case GFS_SET_CAM_ANGLE: { case GFS_SET_CAM_ANGLE: {
int tmp = JSON_ObjectGetInt(jseq_obj, "value", JSON_INVALID_NUMBER); int tmp = JSON_ObjectGetInt(jseq_obj, "value", JSON_INVALID_NUMBER);
if (tmp == JSON_INVALID_NUMBER) { if (tmp == JSON_INVALID_NUMBER) {

18
src/tr1/game/game_flow/sequencer.c
View file

@ -210,15 +210,6 @@ GF_InterpretSequence(int32_t level_num, GAME_FLOW_LEVEL_TYPE level_type)
.param = (int32_t)(intptr_t)event->data & ((1 << 6) - 1), .param = (int32_t)(intptr_t)event->data & ((1 << 6) - 1),
}; };
case GFS_SET_CAM_X:
g_CinePosition.pos.x = (int32_t)(intptr_t)event->data;
break;
case GFS_SET_CAM_Y:
g_CinePosition.pos.y = (int32_t)(intptr_t)event->data;
break;
case GFS_SET_CAM_Z:
g_CinePosition.pos.z = (int32_t)(intptr_t)event->data;
break;
case GFS_SET_CAM_ANGLE: case GFS_SET_CAM_ANGLE:
g_CinePosition.rot = (int32_t)(intptr_t)event->data; g_CinePosition.rot = (int32_t)(intptr_t)event->data;
break; break;
@ -360,15 +351,6 @@ GF_StorySoFar(const GAME_FLOW_SEQUENCE *const sequence, int32_t savegame_level)
.param = (int32_t)(intptr_t)event->data & ((1 << 6) - 1), .param = (int32_t)(intptr_t)event->data & ((1 << 6) - 1),
}; };
case GFS_SET_CAM_X:
g_CinePosition.pos.x = (int32_t)(intptr_t)event->data;
break;
case GFS_SET_CAM_Y:
g_CinePosition.pos.y = (int32_t)(intptr_t)event->data;
break;
case GFS_SET_CAM_Z:
g_CinePosition.pos.z = (int32_t)(intptr_t)event->data;
break;
case GFS_SET_CAM_ANGLE: case GFS_SET_CAM_ANGLE:
g_CinePosition.rot = (int32_t)(intptr_t)event->data; g_CinePosition.rot = (int32_t)(intptr_t)event->data;
break; break;

3
src/tr1/global/enum_map.def
View file

@ -47,9 +47,6 @@ ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_TOTAL_STATS, "total_stats")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_EXIT_TO_TITLE, "exit_to_title") ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_EXIT_TO_TITLE, "exit_to_title")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_EXIT_TO_LEVEL, "exit_to_level") ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_EXIT_TO_LEVEL, "exit_to_level")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_EXIT_TO_CINE, "exit_to_cine") ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_EXIT_TO_CINE, "exit_to_cine")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_SET_CAM_X, "set_cam_x")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_SET_CAM_Y, "set_cam_y")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_SET_CAM_Z, "set_cam_z")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_SET_CAM_ANGLE, "set_cam_angle") ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_SET_CAM_ANGLE, "set_cam_angle")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_FLIP_MAP, "flip_map") ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_FLIP_MAP, "flip_map")
ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_REMOVE_GUNS, "remove_guns") ENUM_MAP_DEFINE(GAME_FLOW_SEQUENCE_EVENT_TYPE, GFS_REMOVE_GUNS, "remove_guns")