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

Fixed ID_MUMMY

Browse source
This commit is contained in:
MontyTRC89 2022-05-16 13:32:29 +02:00
parent e46a737d18
commit 55d10faa8c
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TombEngine/Game/effects/effects.cpp
View file

@ -1076,13 +1076,13 @@ void SetupRipple(int x, int y, int z, float size, char flags, unsigned int sprit
}
}
short DoBloodSplat(int x, int y, int z, short a4, short a5, short roomNumber)
short DoBloodSplat(int x, int y, int z, short speed, short direction, short roomNumber)
{
short probedRoomNumber = GetCollision(x, y, z, roomNumber).RoomNumber;
if (TestEnvironment(ENV_FLAG_WATER, probedRoomNumber))
TriggerUnderwaterBlood(x, y, z, a4);
TriggerUnderwaterBlood(x, y, z, speed);
else
TriggerBlood(x, y, z, a5 >> 4, a4);
TriggerBlood(x, y, z, direction >> 4, speed);
return 0;
}

3
TombEngine/Objects/TR4/Entity/tr4_mummy.cpp
View file

@ -65,7 +65,6 @@ void InitialiseMummy(short itemNumber)
item->Animation.FrameNumber = g_Level.Anims[item->Animation.AnimNumber].frameBase;
item->Animation.TargetState = MUMMY_STATE_LYING_DOWN;
item->Animation.ActiveState = MUMMY_STATE_LYING_DOWN;
item->Status = ITEM_INVISIBLE;
}
else
{
@ -175,7 +174,7 @@ void MummyControl(short itemNumber)
joint1 = 0;
joint2 = 0;
if (item->TriggerFlags > -100 && item->TriggerFlags & 0x8000 < 0)
if (item->TriggerFlags > -100 && item->TriggerFlags < 0)
item->TriggerFlags++;
}
}