mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-14 00:54:05 +02:00
Code Issues Releases Wiki Activity

#3 fix slide-air-slide state

Browse Source
This commit is contained in:
XProger
2017-10-21 19:53:34 +03:00
parent cb04afb7bd
commit 91a0c7487d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lara.h
View File

@@ -476,6 +476,7 @@ struct Lara : Character {
//reset(57, vec3(54844, -3328, 53145), 0); // level 8b (bridge switch) //reset(57, vec3(54844, -3328, 53145), 0); // level 8b (bridge switch)
//reset(12, vec3(34236, -2415, 14974), 0); // level 8b (sphinx) //reset(12, vec3(34236, -2415, 14974), 0); // level 8b (sphinx)
//reset(0, vec3(40913, -1012, 42252), PI); // level 8c //reset(0, vec3(40913, -1012, 42252), PI); // level 8c
//reset(56, vec3(18541, 512, 52869), PI * 0.5f); // level 8c
//reset(30, vec3(69689, -8448, 34922), 330 * DEG2RAD); // Level 10a (cabin) //reset(30, vec3(69689, -8448, 34922), 330 * DEG2RAD); // Level 10a (cabin)
//reset(27, vec3(52631, -4352, 57893), 270 * DEG2RAD); // Level 10a (TNT / Cowboy) //reset(27, vec3(52631, -4352, 57893), 270 * DEG2RAD); // Level 10a (TNT / Cowboy)
//reset(68, vec3(52458, -9984, 93724), 270 * DEG2RAD); // Level 10a (MrT) //reset(68, vec3(52458, -9984, 93724), 270 * DEG2RAD); // Level 10a (MrT)
@@ -1994,7 +1995,7 @@ struct Lara : Character {
} }
} }
int extra = stand != STAND_AIR ? 256 : 0; int extra = (stand != STAND_AIR && stand != STAND_SLIDE) ? 256 : 0;
if (e.y + extra >= info.floor && !(stand == STAND_AIR && velocity.y < 0)) { if (e.y + extra >= info.floor && !(stand == STAND_AIR && velocity.y < 0)) {
if (stand != STAND_GROUND) { if (stand != STAND_GROUND) {