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

Fix flat bridges; Add wrecking ball functions

Browse source
This commit is contained in:
asasas9500 2019-12-23 19:38:47 -03:00
parent 1b1b58be44
commit 45f2adef8e
3 changed files with 107 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TR5Main/Game/objects.cpp
View file

@ -88,7 +88,7 @@ void BridgeFlatFloor(ITEM_INFO* item, int x, int y, int z, int* height)
void BridgeFlatCeiling(ITEM_INFO* item, int x, int y, int z, int* height)
{
if (item->pos.yPos >= y)
if (item->pos.yPos < y)
{
*height = item->pos.yPos + 256;
}

102
TR5Main/Game/traps.cpp
View file

@ -11,6 +11,7 @@ static short CeilingTrapDoorBounds[12] = {-256, 256, 0, 900, -768, -256, -1820,
static PHD_VECTOR CeilingTrapDoorPos = {0, 1056, -480};
static short FloorTrapDoorBounds[12] = {-256, 256, 0, 0, -1024, -256, -1820, 1820, -5460, 5460, -1820, 1820};
static PHD_VECTOR FloorTrapDoorPos = {0, 0, -655};
static short WreckingBallData[2] = {0, 0};
void LaraBurn()
{
@ -558,4 +559,103 @@ void FallingBlockCeiling(ITEM_INFO* item, int x, int y, int z, int* height)
*height = item->pos.yPos + 256;
}
}
}
}
void InitialiseWreckingBall(short itemNumber)
{
ITEM_INFO* item;
short room;
item = &Items[itemNumber];
item->itemFlags[3] = find_a_fucking_item(ID_ANIMATING16) - Items;
room = item->roomNumber;
item->pos.yPos = GetCeiling(GetFloor(item->pos.xPos, item->pos.yPos, item->pos.zPos, &room), item->pos.xPos, item->pos.yPos, item->pos.zPos) + 1644;
GetFloor(item->pos.xPos, item->pos.yPos, item->pos.zPos, &room);
if (room != item->roomNumber)
ItemNewRoom(itemNumber, room);
}
void WreckingBallCollision(short itemNumber, ITEM_INFO* l, COLL_INFO* coll)
{
ITEM_INFO* item;
int x, y, z, test;
short damage;
item = &Items[itemNumber];
if (TestBoundsCollide(item, l, coll->radius))
{
x = l->pos.xPos;
y = l->pos.yPos;
z = l->pos.zPos;
test = (x & 1023) > 256 && (x & 1023) < 768 && (z & 1023) > 256 && (z & 1023) < 768;
damage = item->fallspeed > 0 ? 96 : 0;
if (ItemPushLara(item, l, coll, coll->enableSpaz, 1))
{
if (test)
l->hitPoints = 0;
else
l->hitPoints -= damage;
x -= l->pos.xPos;
y -= l->pos.yPos;
z -= l->pos.zPos;
if (damage)
{
for (int i = 14 + (GetRandomControl() & 3); i > 0; --i)
{
TriggerBlood(l->pos.xPos + (GetRandomControl() & 63) - 32, l->pos.yPos - (GetRandomControl() & 511) - 256,
l->pos.zPos + (GetRandomControl() & 63) - 32, -1, 1);
}
}
if (!coll->enableBaddiePush || test)
{
l->pos.xPos += x;
l->pos.yPos += y;
l->pos.zPos += z;
}
}
}
}
void _WreckingBallControl(short itemNumber)
{
ITEM_INFO* item;
int x, z, test;
item = &Items[itemNumber];
if (LaraItem->pos.xPos >= 45056 && LaraItem->pos.xPos <= 57344 && LaraItem->pos.zPos >= 26624 && LaraItem->pos.zPos <= 43008
|| item->itemFlags[2] < 900)
{
if (item->itemFlags[2] < 900)
{
if (!item->itemFlags[2] || !(GlobalCounter & 0x3F))
{
WreckingBallData[0] = GetRandomControl() % 7 - 3;
WreckingBallData[1] = GetRandomControl() % 7 - 3;
}
x = (WreckingBallData[0] << 10) + 51712;
z = (WreckingBallData[1] << 10) + 34304;
test = 0;
}
else
{
x = LaraItem->pos.xPos;
z = LaraItem->pos.zPos;
}
}
else
{
x = 51200;
z = 33792;
test = 0;
}
if (item->itemFlags[2] < 900)
++item->itemFlags[2];
if (GlobalPlayingCutscene)
{
}
else
{
}
}

7
TR5Main/Game/traps.h
View file

@ -47,8 +47,8 @@
#define InitialisePortal ((void (__cdecl*)(short)) 0x0043FAA0)
#define PortalControl ((void (__cdecl*)(short)) 0x00401AEB)
#define DrawPortal ((void (__cdecl*)(ITEM_INFO*)) 0x004CFF80)
#define InitialiseWreckingBall ((void (__cdecl*)(short)) 0x0043EF20)
#define WreckingBallCollision ((void (__cdecl*)(short,ITEM_INFO*,COLL_INFO*)) 0x00441D50)
//#define InitialiseWreckingBall ((void (__cdecl*)(short)) 0x0043EF20)
//#define WreckingBallCollision ((void (__cdecl*)(short,ITEM_INFO*,COLL_INFO*)) 0x00441D50)
#define WreckingBallControl ((void (__cdecl*)(short)) 0x00441410)
#define DrawWreckingBall ((void (__cdecl*)(ITEM_INFO*)) 0x00441F50)
#define InitialiseVentilator ((void (__cdecl*)(short)) 0x0043F3D0)
@ -74,3 +74,6 @@ void FallingBlockCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll);
void FallingBlockControl(short itemNumber);
void FallingBlockFloor(ITEM_INFO* item, int x, int y, int z, int* height);
void FallingBlockCeiling(ITEM_INFO* item, int x, int y, int z, int* height);
void InitialiseWreckingBall(short itemNumber);
void WreckingBallCollision(short itemNumber, ITEM_INFO* l, COLL_INFO* coll);
void _WreckingBallControl(short itemNumber);