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

fix clockwork control; fix infinite pickup display;

Browse source
This commit is contained in:
Trxye 2021-05-27 17:06:38 -05:00
parent d6bf00d110
commit d4474a1888
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TR5Main/Game/health.cpp
View file

@ -193,7 +193,7 @@ int DrawAllPickups()
{ {
if (PickupX > 0) if (PickupX > 0)
{ {
PickupX += -PickupX / 32; PickupX += -PickupX >> 3;
g_Renderer.drawPickup(Pickups[CurrentPickup].objectNumber); g_Renderer.drawPickup(Pickups[CurrentPickup].objectNumber);
} }
else else

15
TR5Main/Objects/TR4/tr4_objects.cpp
View file

@ -1,5 +1,6 @@
#include "framework.h" #include "framework.h"
#include "tr4_objects.h" #include "tr4_objects.h"
#include "pickup.h"
/// entities /// entities
#include "tr4_ahmet.h" // OK #include "tr4_ahmet.h" // OK
#include "tr4_baddy.h" // OK #include "tr4_baddy.h" // OK
@ -781,6 +782,7 @@ static void StartObject(OBJECT_INFO* obj)
obj->control = MapperControl; obj->control = MapperControl;
obj->saveFlags = true; obj->saveFlags = true;
obj->saveAnim = true; obj->saveAnim = true;
obj->drawRoutine = nullptr;
} }
obj = &Objects[ID_ELEMENT_PUZZLE]; obj = &Objects[ID_ELEMENT_PUZZLE];
@ -844,6 +846,19 @@ static void StartObject(OBJECT_INFO* obj)
{ {
obj->initialise = 0; obj->initialise = 0;
obj->control = ClockworkBeetleControl; obj->control = ClockworkBeetleControl;
obj->collision = PickupCollision;
}
obj = &Objects[ID_CLOCKWORK_BEETLE_COMBO1];
if (obj->loaded)
{
obj->collision = PickupCollision;
}
obj = &Objects[ID_CLOCKWORK_BEETLE_COMBO2];
if (obj->loaded)
{
obj->collision = PickupCollision;
} }
} }

3
TR5Main/Objects/TR5/tr5_objects.cpp
View file

@ -1259,9 +1259,6 @@ static void StartPickup(OBJECT_INFO *obj)
InitPickup(obj, ID_FLARE_INV_ITEM); InitPickup(obj, ID_FLARE_INV_ITEM);
InitPickup(obj, ID_WATERSKIN1_EMPTY); InitPickup(obj, ID_WATERSKIN1_EMPTY);
InitPickup(obj, ID_WATERSKIN2_EMPTY); InitPickup(obj, ID_WATERSKIN2_EMPTY);
InitPickup(obj, ID_CLOCKWORK_BEETLE);
InitPickup(obj, ID_CLOCKWORK_BEETLE_COMBO1);
InitPickup(obj, ID_CLOCKWORK_BEETLE_COMBO2);
InitPickup(obj, ID_GOLDROSE_ITEM); InitPickup(obj, ID_GOLDROSE_ITEM);
} }