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

don't void Lara when a door closes on her (fixes #82)

Browse source
This commit is contained in:
rr- 2021-03-31 01:29:27 +02:00
parent 313a83b0c1
commit cb928f9385
No known key found for this signature in database
GPG key ID: CC65E6FD28CAE42A
4 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -95,6 +95,7 @@ Not all options are turned on by default. Refer to `Tomb1Main.json5` for details
- fixed the sound of collecting a secret killing music
- fixed infamous Tihocan crocodile bug
- fixed Lara jumping forever when alt+tabbing out of the game
- fixed Lara voiding if a badly placed timed door closes on her (doesn't occur in OG levels)
## Showcase

59
src/game/objects/door.c
View file

@ -7,6 +7,10 @@
#include "global/vars.h"
#include "specific/init.h"
static void OpenThatDoor(DOORPOS_DATA *d);
static void ShutThatDoor(DOORPOS_DATA *d, ITEM_INFO *item);
static int8_t LaraDoorCollision(ITEM_INFO *item);
void SetupDoor(OBJECT_INFO *obj)
{
obj->initialise = InitialiseDoor;
@ -17,13 +21,30 @@ void SetupDoor(OBJECT_INFO *obj)
obj->save_flags = 1;
}
void ShutThatDoor(DOORPOS_DATA *d)
static int8_t LaraDoorCollision(ITEM_INFO *item)
{
if (!LaraItem) {
return 0;
}
int32_t max_dist = SQUARE((WALL_L * 2) >> 8);
int32_t dx = ABS(item->pos.x - LaraItem->pos.x) >> 8;
int32_t dy = ABS(item->pos.y - LaraItem->pos.y) >> 8;
int32_t dz = ABS(item->pos.z - LaraItem->pos.z) >> 8;
int32_t dist = SQUARE(dx) + SQUARE(dy) + SQUARE(dz);
return dist < max_dist;
}
static void ShutThatDoor(DOORPOS_DATA *d, ITEM_INFO *item)
{
FLOOR_INFO *floor = d->floor;
if (!floor) {
return;
}
if (LaraDoorCollision(item)) {
return;
}
floor->index = 0;
floor->box = NO_BOX;
floor->floor = NO_HEIGHT / 256;
@ -37,14 +58,14 @@ void ShutThatDoor(DOORPOS_DATA *d)
}
}
void OpenThatDoor(DOORPOS_DATA *d)
static void OpenThatDoor(DOORPOS_DATA *d)
{
FLOOR_INFO *floor = d->floor;
if (!floor) {
return;
}
*floor = d->data;
*floor = d->old_floor;
int16_t box_num = d->block;
if (box_num != NO_BOX) {
@ -94,7 +115,7 @@ void InitialiseDoor(int16_t item_num)
box_num = NO_BOX;
}
door->d1.block = box_num;
door->d1.data = *door->d1.floor;
door->d1.old_floor = *door->d1.floor;
if (r->flipped_room != -1) {
r = &RoomInfo[r->flipped_room];
@ -114,14 +135,14 @@ void InitialiseDoor(int16_t item_num)
box_num = NO_BOX;
}
door->d1flip.block = box_num;
door->d1flip.data = *door->d1flip.floor;
door->d1flip.old_floor = *door->d1flip.floor;
} else {
door->d1flip.floor = NULL;
}
room_num = GetDoor(door->d1.floor);
ShutThatDoor(&door->d1);
ShutThatDoor(&door->d1flip);
ShutThatDoor(&door->d1, item);
ShutThatDoor(&door->d1flip, item);
if (room_num == NO_ROOM) {
door->d2.floor = NULL;
@ -146,7 +167,7 @@ void InitialiseDoor(int16_t item_num)
box_num = NO_BOX;
}
door->d2.block = box_num;
door->d2.data = *door->d2.floor;
door->d2.old_floor = *door->d2.floor;
if (r->flipped_room != -1) {
r = &RoomInfo[r->flipped_room];
@ -166,13 +187,13 @@ void InitialiseDoor(int16_t item_num)
box_num = NO_BOX;
}
door->d2flip.block = box_num;
door->d2flip.data = *door->d2flip.floor;
door->d2flip.old_floor = *door->d2flip.floor;
} else {
door->d2flip.floor = NULL;
}
ShutThatDoor(&door->d2);
ShutThatDoor(&door->d2flip);
ShutThatDoor(&door->d2, item);
ShutThatDoor(&door->d2flip, item);
}
void DoorControl(int16_t item_num)
@ -193,10 +214,10 @@ void DoorControl(int16_t item_num)
if (item->current_anim_state == DOOR_OPEN) {
item->goal_anim_state = DOOR_CLOSED;
} else {
ShutThatDoor(&door->d1);
ShutThatDoor(&door->d2);
ShutThatDoor(&door->d1flip);
ShutThatDoor(&door->d2flip);
ShutThatDoor(&door->d1, item);
ShutThatDoor(&door->d2, item);
ShutThatDoor(&door->d1flip, item);
ShutThatDoor(&door->d2flip, item);
}
}
@ -209,10 +230,10 @@ void OpenNearestDoors(ITEM_INFO *lara_item)
for (int item_num = 0; item_num < LevelItemCount; item_num++) {
ITEM_INFO *item = &Items[item_num];
int32_t x = (item->pos.x - lara_item->pos.x) >> 8;
int32_t y = (item->pos.y - lara_item->pos.y) >> 8;
int32_t z = (item->pos.z - lara_item->pos.z) >> 8;
int32_t dist = SQUARE(x) + SQUARE(y) + SQUARE(z);
int32_t dx = (item->pos.x - lara_item->pos.x) >> 8;
int32_t dy = (item->pos.y - lara_item->pos.y) >> 8;
int32_t dz = (item->pos.z - lara_item->pos.z) >> 8;
int32_t dist = SQUARE(dx) + SQUARE(dy) + SQUARE(dz);
if (dist > max_dist) {
continue;

2
src/game/objects/door.h
View file

@ -4,8 +4,6 @@
#include "global/types.h"
void SetupDoor(OBJECT_INFO *obj);
void ShutThatDoor(DOORPOS_DATA *d);
void OpenThatDoor(DOORPOS_DATA *d);
void InitialiseDoor(int16_t item_num);
void DoorControl(int16_t item_num);
void OpenNearestDoors(ITEM_INFO *lara_item);

2
src/global/types.h
View file

@ -1329,7 +1329,7 @@ typedef struct FLOOR_INFO {
typedef struct DOORPOS_DATA {
/* 0000 */ FLOOR_INFO *floor;
/* 0004 */ FLOOR_INFO data;
/* 0004 */ FLOOR_INFO old_floor;
/* 000C */ int16_t block;
/* 000E end */
} DOORPOS_DATA;