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

Replaced hardcoded Animating 2 for Minecraft switch with new item ID_MINECRAFT_SWITCH

Browse source
This commit is contained in:
Stranger1992 2022-02-20 20:38:14 +00:00
parent 21bbafe469
commit bb976c82dd
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TR5Main/Objects/TR3/Vehicles/minecart.cpp
View file

@ -194,7 +194,7 @@ static void CartToBaddieCollision(ITEM_INFO* v)
if (item->collidable && item->status != ITEM_INVISIBLE && item != LaraItem && item != v) if (item->collidable && item->status != ITEM_INVISIBLE && item != LaraItem && item != v)
{ {
OBJECT_INFO* object = &Objects[item->objectNumber]; OBJECT_INFO* object = &Objects[item->objectNumber];
if (object->collision && (object->intelligent || item->objectNumber == ID_ROLLINGBALL || item->objectNumber == ID_ANIMATING2)) if (object->collision && (object->intelligent || item->objectNumber == ID_ROLLINGBALL || item->objectNumber == ID_MINECART_SWITCH))
{ {
int x = v->pos.xPos - item->pos.xPos; int x = v->pos.xPos - item->pos.xPos;
int y = v->pos.yPos - item->pos.yPos; int y = v->pos.yPos - item->pos.yPos;
@ -203,7 +203,7 @@ static void CartToBaddieCollision(ITEM_INFO* v)
{ {
if (TestBoundsCollide(item, LaraItem, CART_BADDIE_RADIUS)) if (TestBoundsCollide(item, LaraItem, CART_BADDIE_RADIUS))
{ {
if (item->objectNumber == ID_ANIMATING2) if (item->objectNumber == ID_MINECART_SWITCH)
{ {
if ((item->frameNumber == g_Level.Anims[item->animNumber].frameBase) && (LaraItem->currentAnimState == CART_USE) && (LaraItem->animNumber == Objects[ID_MINECART_LARA_ANIMS].animIndex + 6)) if ((item->frameNumber == g_Level.Anims[item->animNumber].frameBase) && (LaraItem->currentAnimState == CART_USE) && (LaraItem->animNumber == Objects[ID_MINECART_LARA_ANIMS].animIndex + 6))
{ {

2
TR5Main/Objects/objectslist.h
View file

@ -65,7 +65,7 @@ enum GAME_OBJECT_ID : short
ID_RUBBER_BOAT, // TR3 / (TR4 TRNG) ID_RUBBER_BOAT, // TR3 / (TR4 TRNG)
ID_BIGGUN_ANIMS, ID_BIGGUN_ANIMS,
ID_BIGGUN, // TR3 ID_BIGGUN, // TR3
ID_MINECART_SWITCH, //NEW - Added to un-hardcode Minecart switch from ANIMATING_2
ID_VEHICLE_SMASHABLE_FLOOR = 90, // NEW ID_VEHICLE_SMASHABLE_FLOOR = 90, // NEW
ID_VEHICLE_SMASHABLE_WALL, // NEW ID_VEHICLE_SMASHABLE_WALL, // NEW