Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support cutscenes and demos in the photo mode #1678

Merged
merged 13 commits into from
Oct 7, 2024
8 changes: 6 additions & 2 deletions data/tr1/ship/cfg/TR1X_gameflow.json5
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,8 @@
"inherit_injections": false,
"injections": [
"data/injections/backpack_cut.bin",
"data/injections/braid_cut1.bin"
"data/injections/braid_cut1.bin",
"data/injections/photo.bin",
],
"sequence": [
{"type": "start_cine"},
Expand All @@ -488,7 +489,8 @@
"inherit_injections": false,
"injections": [
"data/injections/backpack_cut.bin",
"data/injections/braid_cut2_cut4.bin"
"data/injections/braid_cut2_cut4.bin",
"data/injections/photo.bin",
],
"sequence": [
{"type": "start_cine"},
Expand All @@ -514,6 +516,7 @@
"inherit_injections": false,
"injections": [
"data/injections/cut3_textures.bin",
"data/injections/photo.bin",
],
"sequence": [
{"type": "start_cine"},
Expand All @@ -540,6 +543,7 @@
"data/injections/backpack_cut.bin",
"data/injections/braid_cut2_cut4.bin",
"data/injections/cut4_textures.bin",
"data/injections/photo.bin",
],
"sequence": [
{"type": "start_cine"},
Expand Down
Binary file added data/tr1/ship/data/injections/photo.bin
Binary file not shown.
25 changes: 17 additions & 8 deletions docs/tr1/GAMEFLOW.md
Original file line number Diff line number Diff line change
Expand Up @@ -1412,14 +1412,6 @@ provided with the game achieves.
PS1 version but not the PC.
</td>
</tr>
<tr valign="top">
<td>
<code>explosion.bin</code>
</td>
<td>
Injects explosion sprites for certain console commands.
</td>
</tr>
<tr valign="top">
<td>
<code>lara_animations.bin</code>
Expand All @@ -1438,6 +1430,23 @@ provided with the game achieves.
jumping, if that option is enabled.
</td>
</tr>
<tr valign="top">
<td>
<code>explosion.bin</code>
</td>
<td>
Injects explosion sprites for certain console commands.
</td>
</tr>
<tr valign="top">
<td>
<code>photo.bin</code>
</td>
<td>
Injects camera shutter sound effect for the photo mode, needed only for
the cutscene levels.
</td>
</tr>
<tr valign="top">
<td>
<code>purple_crystal.bin</code>
Expand Down
2 changes: 1 addition & 1 deletion src/libtrx/game/ui/widgets/console.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "game/clock.h"
#include "game/console/common.h"
#include "game/text.h"
#include "game/ui/common.h"
#include "game/ui/events.h"
#include "game/ui/widgets/label.h"
Expand All @@ -11,7 +12,6 @@
#include "memory.h"
#include "strings.h"
#include "utils.h"
#include "game/text.h"

#include <string.h>

Expand Down
1 change: 0 additions & 1 deletion src/tr1/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ void Config_ApplyChanges(void)
Requester_Shutdown(&g_SavegameRequester);
Requester_Init(&g_SavegameRequester, g_Config.maximum_save_slots);
Output_ApplyRenderSettings();
Viewport_SetFOV(Viewport_GetUserFOV());
}

const CONFIG_OPTION *Config_GetOptionMap(void)
Expand Down
14 changes: 2 additions & 12 deletions src/tr1/game/camera.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
#pragma once

#include "global/types.h"

#include <stdint.h>

void Camera_Initialise(void);
void Camera_Reset(void);
void Camera_ResetPosition(void);
void Camera_Update(void);
void Camera_UpdateCutscene(void);
void Camera_RefreshFromTrigger(const TRIGGER *trigger);
void Camera_MoveManual(void);
void Camera_Apply(void);
#include "game/camera/common.h"
#include "game/camera/photo_mode.h"
Loading
Loading