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

restore bitshifts in TestTriggers() to fix triggers

Browse source
This commit is contained in:
Woops 2020-10-16 22:39:22 -05:00
parent 47fc1ecb13
commit c5c54a6590
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TR5Main/Game/control.cpp
View file

@ -852,7 +852,7 @@ void TestTriggers(short *data, int heavy, int HeavyFlags)
data++; data++;
} }
short triggerType = (*(data++) / 256) & 0x3F; short triggerType = (*(data++) >> 8) & 0x3F;
short flags = *(data++); short flags = *(data++);
short timer = flags & 0xFF; short timer = flags & 0xFF;
@ -999,7 +999,7 @@ void TestTriggers(short *data, int heavy, int HeavyFlags)
{ {
trigger = *(data++); trigger = *(data++);
value = trigger & VALUE_BITS; value = trigger & VALUE_BITS;
targetType = (trigger / 1024) & 0xF; targetType = (trigger >> 10) & 0xF;
switch (targetType) switch (targetType)
{ {
@ -1149,7 +1149,7 @@ void TestTriggers(short *data, int heavy, int HeavyFlags)
if (trigger & 0x100) if (trigger & 0x100)
FixedCameras[Camera.number].flags |= 0x100; FixedCameras[Camera.number].flags |= 0x100;
Camera.speed = ((trigger & CODE_BITS) / 64) + 1; Camera.speed = ((trigger & CODE_BITS) >> 6) + 1;
Camera.type = heavy ? HEAVY_CAMERA : FIXED_CAMERA; Camera.type = heavy ? HEAVY_CAMERA : FIXED_CAMERA;
} }
break; break;