1
0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-12 08:04:09 +02:00

fix TR2 & TR3 cutscenes

This commit is contained in:
XProger
2019-01-12 10:09:49 +03:00
parent 91e19f8b55
commit b890fec271
3 changed files with 2 additions and 2 deletions

View File

@@ -877,7 +877,7 @@ struct WaterCache {
} }
void simulate() { void simulate() {
PROFILE_MARKER("WATER_SIMULATE"); PROFILE_MARKER("WATER_SIMULATE");
// simulate water // simulate water
Core::setDepthTest(false); Core::setDepthTest(false);
Core::setBlendMode(bmNone); Core::setBlendMode(bmNone);

View File

@@ -895,7 +895,6 @@ namespace TR {
DRAW_LEFTGUN , DRAW_LEFTGUN ,
SHOT_RIGHTGUN , SHOT_RIGHTGUN ,
SHOT_LEFTGUN , SHOT_LEFTGUN ,
UNKNOWN ,
MESH_SWAP_1 , MESH_SWAP_1 ,
MESH_SWAP_2 , MESH_SWAP_2 ,
MESH_SWAP_3 , MESH_SWAP_3 ,

View File

@@ -1528,6 +1528,7 @@ struct Lara : Character {
} }
void drawGun(int right) { void drawGun(int right) {
wpnCurrent = TR::Entity::PISTOLS;
int mask = (right ? JOINT_MASK_ARM_R3 : JOINT_MASK_ARM_L3); // unholster int mask = (right ? JOINT_MASK_ARM_R3 : JOINT_MASK_ARM_L3); // unholster
if (layers[1].mask & mask) if (layers[1].mask & mask)
mask = (layers[1].mask & ~mask) | (right ? JOINT_MASK_LEG_R1 : JOINT_MASK_LEG_L1); // holster mask = (layers[1].mask & ~mask) | (right ? JOINT_MASK_LEG_R1 : JOINT_MASK_LEG_L1); // holster