Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #1312

Browse source
This commit is contained in:
Lwmte 2024-02-18 02:48:07 +01:00
parent fec6828928
commit 35e411b9a8
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Documentation/Changes.txt
View file

@ -2,6 +2,7 @@ Version 1.4
===========
* Fixed fade-in and fade-out effects not canceling properly when next level is loaded.
* Fixed FOV interpolation at the end of the flyby sequence.
* Fixed sounds resuming in pause mode while switching between apps.
* Fixed slide directions.
* Revise wall spikes:

8
TombEngine/Game/spotcam.cpp
View file

@ -640,7 +640,7 @@ void CalculateSpotCameras()
CurrentSplineCamera = FirstCamera;
SpotcamLoopCnt++;
}
else if (s->flags & SCF_PAN_TO_LARA_CAM || SplineToCamera)
else if (s->flags & SCF_CUT_TO_LARA_CAM || SplineToCamera)
{
if (CheckTrigger)
{
@ -671,7 +671,7 @@ void CalculateSpotCameras()
Camera.type = CameraType::Chase;
Camera.speed = 1;
if (s->flags & SCF_PAN_TO_LARA_CAM)
if (s->flags & SCF_CUT_TO_LARA_CAM)
{
Camera.pos.x = InitialCameraPosition.x;
Camera.pos.y = InitialCameraPosition.y;
@ -735,7 +735,7 @@ void CalculateSpotCameras()
CameraXtarget[3] = Camera.target.x;
CameraYtarget[3] = Camera.target.y;
CameraZtarget[3] = Camera.target.z;
CameraFOV[3] = CurrentFOV;
CameraFOV[3] = LastFOV;
CameraSpeed[3] = CameraSpeed[2];
CameraRoll[3] = 0;
@ -745,7 +745,7 @@ void CalculateSpotCameras()
CameraXtarget[4] = Camera.target.x;
CameraYtarget[4] = Camera.target.y;
CameraZtarget[4] = Camera.target.z;
CameraFOV[4] = CurrentFOV;
CameraFOV[4] = LastFOV;
CameraSpeed[4] = CameraSpeed[2] >> 1;
CameraRoll[4] = 0;

2
TombEngine/Game/spotcam.h
View file

@ -33,7 +33,7 @@ enum SPOTCAM_FLAGS
SCF_TRACKING_CAM = (1 << 3),
SCF_HIDE_LARA = (1 << 4),
SCF_FOCUS_LARA_HEAD = (1 << 5),
SCF_PAN_TO_LARA_CAM = (1 << 6),
SCF_CUT_TO_LARA_CAM = (1 << 6),
SCF_CUT_TO_CAM = (1 << 7),
SCF_STOP_MOVEMENT = (1 << 8), // Stop movement for a given time (cf. `Timer` field).
SCF_DISABLE_BREAKOUT = (1 << 9), // Disable breaking out from cutscene using LOOK key.