From ededdc0c1d054ea74e5aad624bee8af00d7ac49f Mon Sep 17 00:00:00 2001 From: Lwmte Date: Tue, 14 Sep 2021 11:09:29 +0300 Subject: [PATCH] Fix jumping into objects --- TR5Main/Game/Lara/lara_basic.cpp | 2 -- TR5Main/Objects/Generic/Doors/generic_doors.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TR5Main/Game/Lara/lara_basic.cpp b/TR5Main/Game/Lara/lara_basic.cpp index 6791bbde5..066d4fe1f 100644 --- a/TR5Main/Game/Lara/lara_basic.cpp +++ b/TR5Main/Game/Lara/lara_basic.cpp @@ -665,8 +665,6 @@ void lara_col_forwardjump(ITEM_INFO* item, COLL_INFO* coll) if (coll->Middle.Floor != NO_HEIGHT) item->pos.yPos += coll->Middle.Floor; - - AnimateLara(item); } } diff --git a/TR5Main/Objects/Generic/Doors/generic_doors.cpp b/TR5Main/Objects/Generic/Doors/generic_doors.cpp index d4a41941c..83fab019e 100644 --- a/TR5Main/Objects/Generic/Doors/generic_doors.cpp +++ b/TR5Main/Objects/Generic/Doors/generic_doors.cpp @@ -441,6 +441,8 @@ namespace TEN::Entities::Doors floor->TriggerIndex = 0; // FIXME: HACK!!!!!!! + // We should find a better way of dealing with doors using new floordata. + floor->WallPortal = -1; floor->FloorCollision.Portals[0] = NO_ROOM; floor->FloorCollision.Portals[1] = NO_ROOM;