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

Fix boat reenter

Browse source
This commit is contained in:
Lwmte 2021-12-09 20:58:52 +03:00
parent cc66f2633b
commit 9e15105db0
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
TR5Main/Objects/TR2/Vehicles/boat.cpp
View file

@ -248,7 +248,7 @@ BOAT_GETON SpeedBoatCheckGeton(short itemNum, COLL_INFO* coll)
{ {
if (LaraItem->fallspeed > 0) if (LaraItem->fallspeed > 0)
{ {
if (rot > -ANGLE(135) && rot < ANGLE(135) && (LaraItem->pos.yPos + 512) > boat->pos.yPos) if (rot > -ANGLE(135) && rot < ANGLE(135) && LaraItem->pos.yPos > boat->pos.yPos)
geton = BOAT_GETON::JUMP; geton = BOAT_GETON::JUMP;
} }
else if (LaraItem->fallspeed == 0) else if (LaraItem->fallspeed == 0)
@ -827,15 +827,12 @@ void InitialiseSpeedBoat(short itemNum)
void SpeedBoatCollision(short itemNum, ITEM_INFO* litem, COLL_INFO* coll) void SpeedBoatCollision(short itemNum, ITEM_INFO* litem, COLL_INFO* coll)
{ {
int geton;
ITEM_INFO* boat;
if (litem->hitPoints < 0 || Lara.Vehicle != NO_ITEM) if (litem->hitPoints < 0 || Lara.Vehicle != NO_ITEM)
return; return;
boat = &g_Level.Items[itemNum]; auto boat = &g_Level.Items[itemNum];
geton = SpeedBoatCheckGeton(itemNum, coll); auto geton = SpeedBoatCheckGeton(itemNum, coll);
if (!geton) if (!geton)
{ {
coll->Setup.EnableObjectPush = true; coll->Setup.EnableObjectPush = true;
@ -843,14 +840,24 @@ void SpeedBoatCollision(short itemNum, ITEM_INFO* litem, COLL_INFO* coll)
return; return;
} }
if (geton == 2) switch (geton)
{
case BOAT_GETON::WATER_LEFT:
litem->animNumber = Objects[ID_SPEEDBOAT_LARA_ANIMS].animIndex + BOAT_GETONLW_ANIM; litem->animNumber = Objects[ID_SPEEDBOAT_LARA_ANIMS].animIndex + BOAT_GETONLW_ANIM;
else if (geton == 1) break;
case BOAT_GETON::WATER_RIGHT:
litem->animNumber = Objects[ID_SPEEDBOAT_LARA_ANIMS].animIndex + BOAT_GETONRW_ANIM; litem->animNumber = Objects[ID_SPEEDBOAT_LARA_ANIMS].animIndex + BOAT_GETONRW_ANIM;
else if (geton == 3) break;
case BOAT_GETON::JUMP:
litem->animNumber = Objects[ID_SPEEDBOAT_LARA_ANIMS].animIndex + BOAT_GETONJ_ANIM; litem->animNumber = Objects[ID_SPEEDBOAT_LARA_ANIMS].animIndex + BOAT_GETONJ_ANIM;
else break;
default:
litem->animNumber = Objects[ID_SPEEDBOAT_LARA_ANIMS].animIndex + BOAT_GETON_START; litem->animNumber = Objects[ID_SPEEDBOAT_LARA_ANIMS].animIndex + BOAT_GETON_START;
break;
}
Lara.waterStatus = LW_ABOVE_WATER; Lara.waterStatus = LW_ABOVE_WATER;
litem->pos.xPos = boat->pos.xPos; litem->pos.xPos = boat->pos.xPos;