Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 12:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tr2/objects/switch: fix weird airlock interaction

Browse source 
Resolves #2186.
This commit is contained in:
Marcin Kurczewski 2025-01-01 02:24:09 +01:00
parent 13c15afc7e
commit 7c4a95a7c9
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/tr2/CHANGELOG.md
View file

@ -32,6 +32,7 @@
- fixed Lara spawning air bubbles above water surfaces during the fly cheat (#2115, regression from 0.3)
- fixed demos playing too eagerly (#2068, regression from 0.3)
- fixed Lara sometimes being unable to use switches (#2184, regression from 0.6)
- fixed Lara interacting with airlock switches in unexpected ways (#2186, regression from 0.6)
- improved the animation of Lara's braid (#2094)
## [0.7.1](https://github.com/LostArtefacts/TRX/compare/tr2-0.7...tr2-0.7.1) - 2024-12-17

20
src/tr2/game/objects/general/switch.c
View file

@ -46,9 +46,6 @@ static void M_AlignLara(ITEM *const lara_item, ITEM *const switch_item)
{
switch (switch_item->object_id) {
case O_SWITCH_TYPE_AIRLOCK:
if (switch_item->current_anim_state == SWITCH_STATE_ON) {
return;
}
Item_AlignPosition(&m_AirlockPosition, switch_item, lara_item);
break;
@ -65,10 +62,6 @@ static void M_AlignLara(ITEM *const lara_item, ITEM *const switch_item)
static void M_SwitchOn(ITEM *const switch_item, ITEM *const lara_item)
{
switch (switch_item->object_id) {
default:
lara_item->anim_num = g_Objects[O_LARA].anim_idx + LA_WALL_SWITCH_DOWN;
break;
case O_SWITCH_TYPE_SMALL:
lara_item->anim_num = g_Objects[O_LARA].anim_idx + LA_SWITCH_SMALL_DOWN;
break;
@ -76,6 +69,10 @@ static void M_SwitchOn(ITEM *const switch_item, ITEM *const lara_item)
case O_SWITCH_TYPE_BUTTON:
lara_item->anim_num = g_Objects[O_LARA].anim_idx + LA_BUTTON_PUSH;
break;
default:
lara_item->anim_num = g_Objects[O_LARA].anim_idx + LA_WALL_SWITCH_DOWN;
break;
}
lara_item->current_anim_state = LS_SWITCH_ON;
@ -123,16 +120,21 @@ void Switch_Setup(OBJECT *const obj, const bool underwater)
void Switch_Collision(
const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll)
{
ITEM *const item = &g_Items[item_num];
ITEM *const item = Item_Get(item_num);
if (!g_Input.action || item->status != IS_INACTIVE
|| g_Lara.gun_status != LGS_ARMLESS || lara_item->gravity
|| lara_item->current_anim_state != LS_STOP
|| !Item_TestPosition(m_SwitchBounds, &g_Items[item_num], lara_item)) {
|| !Item_TestPosition(m_SwitchBounds, item, lara_item)) {
return;
}
lara_item->rot.y = item->rot.y;
if (item->object_id == O_SWITCH_TYPE_AIRLOCK
&& item->current_anim_state == SWITCH_STATE_ON) {
return;
}
M_AlignLara(lara_item, item);
if (item->current_anim_state == SWITCH_STATE_ON) {