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

Fix combat camera flicker on entering quicksand

Browse source
This commit is contained in:
Lwmte 2021-11-07 05:09:03 +03:00
parent c4a3fa089d
commit 58dbc45be3
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TR5Main/Game/camera.cpp
View file

@ -542,8 +542,14 @@ void CombatCamera(ITEM_INFO* item)
Camera.targetAngle = Lara.headYrot + Lara.torsoYrot;
Camera.targetElevation = Lara.headXrot + Lara.torsoXrot + item->pos.xRot - ANGLE(15);
}
FLOOR_INFO* floor = GetFloor(Camera.target.x, Camera.target.y, Camera.target.z, &Camera.target.roomNumber);
short roomNumber = Camera.target.roomNumber;
GetFloor(Camera.target.x, Camera.target.y + STEP_SIZE, Camera.target.z, &roomNumber);
if (g_Level.Rooms[roomNumber].flags & ENV_FLAG_SWAMP)
Camera.target.y = g_Level.Rooms[roomNumber].y - STEP_SIZE;
auto floor = GetFloor(Camera.target.x, Camera.target.y, Camera.target.z, &Camera.target.roomNumber);
int h = GetFloorHeight(floor, Camera.target.x, Camera.target.y, Camera.target.z);
int c = GetCeiling(floor, Camera.target.x, Camera.target.y, Camera.target.z);
@ -569,7 +575,7 @@ void CombatCamera(ITEM_INFO* item)
int y = Camera.target.y;
int z = Camera.target.z;
short roomNumber = Camera.target.roomNumber;
roomNumber = Camera.target.roomNumber;
floor = GetFloor(Camera.target.x, Camera.target.y, Camera.target.z, &roomNumber);
h = GetFloorHeight(floor, x, y, z);
c = GetCeiling(floor, x, y, z);