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

Merge branch 'master' into arbitrary_hanging_and_shimmying

Browse source
This commit is contained in:
Lwmte 2021-10-29 04:06:57 +03:00
commit b3869676fc
15 changed files with 279 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TR5Main/Game/animation.cpp
View file

@ -122,12 +122,12 @@ void AnimateItem(ITEM_INFO* item)
}
else if (g_Level.Rooms[item->roomNumber].flags & ENV_FLAG_WATER)
{
if (!flags || flags == SFX_WATERONLY && (g_Level.Rooms[Camera.pos.roomNumber].flags & ENV_FLAG_WATER || Objects[item->objectNumber].intelligent))
if (!flags || flags == (int)SOUND_PLAYCONDITION::Water && (g_Level.Rooms[Camera.pos.roomNumber].flags & ENV_FLAG_WATER || Objects[item->objectNumber].intelligent))
{
SoundEffect(cmd[1] & 0x3FFF, &item->pos, 2);
}
}
else if (!flags || flags == SFX_LANDONLY && !(g_Level.Rooms[Camera.pos.roomNumber].flags & ENV_FLAG_WATER))
else if (!flags || flags == (int)SOUND_PLAYCONDITION::Land && !(g_Level.Rooms[Camera.pos.roomNumber].flags & ENV_FLAG_WATER))
{
SoundEffect(cmd[1] & 0x3FFF, &item->pos, 2);
}