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

Formatting

Browse source
This commit is contained in:
Sezz 2023-06-15 18:20:57 +10:00
parent be87730ddf
commit 22cdc2d681
3 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
TombEngine/Game/control/trigger.cpp
View file

@ -64,17 +64,15 @@ int TriggerActive(ItemInfo* item)
bool GetKeyTrigger(ItemInfo* item) bool GetKeyTrigger(ItemInfo* item)
{ {
auto triggerIndex = GetTriggerIndex(item); short* triggerIndexPtr = GetTriggerIndex(item);
if (triggerIndexPtr == nullptr)
if (triggerIndex == nullptr)
return false; return false;
short* trigger = triggerIndex; short* triggerPtr = triggerIndexPtr;
if (*triggerPtr & END_BIT)
if (*trigger & END_BIT)
return false; return false;
for (short* j = &trigger[2]; (*j >> 8) & 0x3C || item != &g_Level.Items[*j & VALUE_BITS]; j++) for (short* j = &triggerPtr[2]; (*j >> 8) & 0x3C || item != &g_Level.Items[*j & VALUE_BITS]; j++)
{ {
if (*j & END_BIT) if (*j & END_BIT)
return false; return false;
@ -86,13 +84,11 @@ bool GetKeyTrigger(ItemInfo* item)
// NOTE: attatchedToSwitch parameter unused. // NOTE: attatchedToSwitch parameter unused.
int GetSwitchTrigger(ItemInfo* item, short* itemNumbersPtr, int attatchedToSwitch) int GetSwitchTrigger(ItemInfo* item, short* itemNumbersPtr, int attatchedToSwitch)
{ {
auto triggerIndex = GetTriggerIndex(item); short* triggerIndexPtr = GetTriggerIndex(item);
if (triggerIndexPtr == nullptr)
if (triggerIndex == nullptr)
return 0; return 0;
short* trigger = triggerIndex; short* trigger = triggerIndexPtr;
if (*trigger & END_BIT) if (*trigger & END_BIT)
return 0; return 0;

10
TombEngine/Game/items.h
View file

@ -44,12 +44,12 @@ enum ItemStatus
enum ItemFlags enum ItemFlags
{ {
IFLAG_TRIGGERED = (1 << 5), IFLAG_TRIGGERED = (1 << 5),
IFLAG_CLEAR_BODY = (1 << 7), IFLAG_CLEAR_BODY = (1 << 7),
IFLAG_INVISIBLE = (1 << 8), IFLAG_INVISIBLE = (1 << 8),
IFLAG_ACTIVATION_MASK = (0x1F << 9), // Bits 9-13 (IFLAG_CODEBITS) IFLAG_ACTIVATION_MASK = (0x1F << 9), // Bits 9-13 (IFLAG_CODEBITS)
IFLAG_REVERSE = (1 << 14), IFLAG_REVERSE = (1 << 14),
IFLAG_KILLED = (1 << 15) IFLAG_KILLED = (1 << 15)
}; };
enum class EffectType enum class EffectType

13
TombEngine/Objects/Generic/puzzles_keys.cpp
View file

@ -230,15 +230,14 @@ void PuzzleDoneCollision(short itemNumber, ItemInfo* laraItem, CollisionInfo* co
auto& player = GetLaraInfo(*laraItem); auto& player = GetLaraInfo(*laraItem);
// NOTE: Only execute code below if Triggertype is switch trigger. // NOTE: Only execute code below if Triggertype is switch trigger.
auto triggerIndex = GetTriggerIndex(&receptacleItem); short* triggerIndexPtr = GetTriggerIndex(&receptacleItem);
if (triggerIndexPtr == nullptr)
if (triggerIndex == nullptr)
return; return;
int triggerType = (*(triggerIndex++) >> 8) & TRIGGER_BITS; int triggerType = (*(triggerIndexPtr++) >> 8) & TRIGGER_BITS;
if (triggerType != TRIGGER_TYPES::SWITCH) if (triggerType != TRIGGER_TYPES::SWITCH)
return; return;
AnimateItem(&receptacleItem); AnimateItem(&receptacleItem);
// Start level with correct object when loading game. // Start level with correct object when loading game.
@ -330,8 +329,8 @@ void PuzzleDoneCollision(short itemNumber, ItemInfo* laraItem, CollisionInfo* co
void PuzzleDone(ItemInfo* item, short itemNumber) void PuzzleDone(ItemInfo* item, short itemNumber)
{ {
auto triggerIndex = GetTriggerIndex(item); short* triggerIndexPtr = GetTriggerIndex(item);
short triggerType = (triggerIndex != nullptr) ? (*(triggerIndex++) >> 8) & TRIGGER_BITS : TRIGGER_TYPES::TRIGGER; short triggerType = (triggerIndexPtr != nullptr) ? (*(triggerIndexPtr++) >> 8) & TRIGGER_BITS : TRIGGER_TYPES::TRIGGER;
if (triggerType == TRIGGER_TYPES::SWITCH) if (triggerType == TRIGGER_TYPES::SWITCH)
{ {