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

Fix lara_col_back()

Browse source
This commit is contained in:
asasas9500 2020-03-31 21:03:28 -03:00
parent a9b95ef343
commit a2fce84b72
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
TR5Main/Game/lara.cpp
View file

@ -1294,7 +1294,7 @@ void lara_col_stepright(ITEM_INFO* item, COLL_INFO* coll)//1BFB0, 1C0E4 (F)
} }
} }
void lara_col_back(ITEM_INFO* item, COLL_INFO* coll)//1BE38, 1BF6C (F) void lara_col_back(ITEM_INFO* item, COLL_INFO* coll) // (F) (D)
{ {
item->gravityStatus = false; item->gravityStatus = false;
item->fallspeed = 0; item->fallspeed = 0;
@ -1307,7 +1307,7 @@ void lara_col_back(ITEM_INFO* item, COLL_INFO* coll)//1BE38, 1BF6C (F)
coll->badNeg = -STEPUP_HEIGHT; coll->badNeg = -STEPUP_HEIGHT;
coll->badCeiling = 0; coll->badCeiling = 0;
coll->slopesArePits = true; coll->slopesArePits = true;
coll->slopesAreWalls = true; coll->slopesAreWalls = 1;
GetLaraCollisionInfo(item, coll); GetLaraCollisionInfo(item, coll);
if (LaraHitCeiling(item, coll)) if (LaraHitCeiling(item, coll))
@ -1319,7 +1319,7 @@ void lara_col_back(ITEM_INFO* item, COLL_INFO* coll)//1BE38, 1BF6C (F)
if (LaraFallen(item, coll)) if (LaraFallen(item, coll))
return; return;
if (coll->midFloor > STEP_SIZE/2 && coll->midFloor < STEPUP_HEIGHT) if (coll->midFloor > STEP_SIZE / 2 && coll->midFloor < STEPUP_HEIGHT)
{ {
if (item->frameNumber >= 964 && item->frameNumber <= 993) if (item->frameNumber >= 964 && item->frameNumber <= 993)
{ {
@ -1336,10 +1336,15 @@ void lara_col_back(ITEM_INFO* item, COLL_INFO* coll)//1BE38, 1BF6C (F)
if (TestLaraSlide(item, coll)) if (TestLaraSlide(item, coll))
return; return;
#if 0
if (!(Rooms[item->roomNumber].flags & ENV_FLAG_SWAMP) || coll->midFloor < 0) if (!(Rooms[item->roomNumber].flags & ENV_FLAG_SWAMP) || coll->midFloor < 0)
item->pos.yPos += coll->midFloor; item->pos.yPos += coll->midFloor;
else if (Rooms[item->roomNumber].flags & ENV_FLAG_SWAMP && coll->midFloor) else if (Rooms[item->roomNumber].flags & ENV_FLAG_SWAMP && coll->midFloor)
item->pos.yPos += SWAMP_GRAVITY; item->pos.yPos += SWAMP_GRAVITY;
#else
if (coll->midFloor != NO_HEIGHT)
item->pos.yPos += coll->midFloor;
#endif
} }
void lara_col_compress(ITEM_INFO* item, COLL_INFO* coll)//1BD30, 1BE64 (F) void lara_col_compress(ITEM_INFO* item, COLL_INFO* coll)//1BD30, 1BE64 (F)