Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-06 19:01:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'errors'

Browse source 
# Conflicts:
#	TR5Main/Game/effects/flmtorch.cpp
#	TR5Main/Game/objects.cpp
#	TR5Main/Objects/Effects/enemy_missile.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
This commit is contained in:
MontyTRC89 2021-10-28 11:06:02 +02:00
commit e4329c4974
68 changed files with 509 additions and 564 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TR5Main/Game/spotcam.cpp
View file

@ -560,7 +560,7 @@ void CalculateSpotCameras()
if (CheckTrigger)
{
CAMERA_TYPE oldType = Camera.type;
Camera.type = HEAVY_CAMERA;
Camera.type = CAMERA_TYPE::HEAVY_CAMERA;
if (CurrentLevel != 0)
{
TestTriggers(Camera.pos.x, Camera.pos.y, Camera.pos.z, Camera.pos.roomNumber, true);
@ -756,7 +756,7 @@ void CalculateSpotCameras()
if (CheckTrigger)
{
CAMERA_TYPE oldType = Camera.type;
Camera.type = HEAVY_CAMERA;
Camera.type = CAMERA_TYPE::HEAVY_CAMERA;
if (CurrentLevel)
{
TestTriggers(Camera.pos.x, Camera.pos.y, Camera.pos.z, Camera.pos.roomNumber, true);
@ -778,8 +778,8 @@ void CalculateSpotCameras()
UseSpotCam = 0;
Lara.uncontrollable = false;
CheckTrigger = 0;
Camera.oldType = FIXED_CAMERA;
Camera.type = CHASE_CAMERA;
Camera.oldType = CAMERA_TYPE::FIXED_CAMERA;
Camera.type = CAMERA_TYPE::CHASE_CAMERA;
Camera.speed = 1;
if (s->flags & SCF_PAN_TO_LARA_CAM)
@ -820,8 +820,8 @@ void CalculateSpotCameras()
CameraSpeed[2] = SpotCam[CurrentSplineCamera - 1].speed;
memcpy((char*)& Backup, (char*)& Camera, sizeof(CAMERA_INFO));
Camera.oldType = FIXED_CAMERA;
Camera.type = CHASE_CAMERA;
Camera.oldType = CAMERA_TYPE::FIXED_CAMERA;
Camera.type = CAMERA_TYPE::CHASE_CAMERA;
Camera.speed = 1;
int elevation = Camera.targetElevation;
@ -881,7 +881,7 @@ void CalculateSpotCameras()
{
if (!SpotCamFirstLook)
{
Camera.oldType = FIXED_CAMERA;
Camera.oldType = CAMERA_TYPE::FIXED_CAMERA;
SpotCamFirstLook = true;
}