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

Refactored switches

Browse source
This commit is contained in:
MontyTRC89 2021-08-28 06:37:22 +02:00
parent 82898fe37b
commit d0da243f73
48 changed files with 910 additions and 907 deletions
Download patch file Download diff file Expand all files Collapse all files

66
TR5Main/Specific/setup.cpp
View file

@ -31,11 +31,10 @@
/// register objects
#include "object_helper.h"
extern byte SequenceUsed[6];
extern byte SequenceResults[3][3][3];
extern byte Sequences[3];
extern byte CurrentSequence;
extern int NumRPickups;
#include "generic_switch.h"
#include "fullblock_switch.h"
using namespace TEN::Entities::Switches;
OBJECT_INFO Objects[ID_NUMBER_OBJECTS];
STATIC_INFO StaticObjects[MAX_STATICS];
@ -163,63 +162,14 @@ void ObjectObjects()
obj->saveMesh = true;
}
obj = &Objects[ID_AIRLOCK_SWITCH];
/*obj = &Objects[ID_AIRLOCK_SWITCH];
if (obj->loaded)
{
obj->collision = ten::entities::switches::SwitchCollision;
obj->collision = TEN::Entities::Switches::SwitchCollision;
obj->control = SwitchControl;
obj->saveFlags = true;
obj->saveAnim = true;
}
obj = &Objects[ID_SEQUENCE_SWITCH1];
if (obj->loaded)
{
obj->collision = FullBlockSwitchCollision;
obj->control = FullBlockSwitchControl;
obj->saveFlags = true;
obj->saveAnim = true;
}
obj = &Objects[ID_SEQUENCE_SWITCH2];
if (obj->loaded)
{
obj->collision = FullBlockSwitchCollision;
obj->control = FullBlockSwitchControl;
obj->saveFlags = true;
obj->saveAnim = true;
}
obj = &Objects[ID_SEQUENCE_SWITCH3];
if (obj->loaded)
{
obj->collision = FullBlockSwitchCollision;
obj->control = FullBlockSwitchControl;
obj->saveFlags = true;
obj->saveAnim = true;
}
obj = &Objects[ID_PULLEY];
if (obj->loaded)
{
obj->initialise = InitialisePulleySwitch;
obj->control = SwitchControl;
obj->collision = PulleyCollision;
obj->saveFlags = true;
obj->saveAnim = true;
}
obj = &Objects[ID_CROWDOVE_SWITCH];
if (obj->loaded)
{
obj->initialise = InitialiseCrowDoveSwitch;
obj->collision = CrowDoveSwitchCollision;
obj->control = CrowDoveSwitchControl;
obj->hitEffect = HIT_RICOCHET;
obj->saveFlags = true;
obj->saveAnim = true;
obj->saveMesh = true;
}
}*/
for (int objNum = ID_DOOR_TYPE1; objNum <= ID_CLOSED_DOOR6; objNum++)
{
@ -601,7 +551,7 @@ void InitialiseSpecialEffects()
NextDrip = 0;
NextBlood = 0;
WBRoom = -1;
ten::entities::tr4::ClearScarabs();
TEN::Entities::TR4::ClearScarabs();
}
void CustomObjects()