zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 12:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed usage of floor sound with Plat_DownWaitUpStayLip special

Browse source 
https://forum.zdoom.org/viewtopic.php?t=67126

# Conflicts:
#	src/p_plats.cpp
#	src/playsim/mapthinkers/a_plats.h
This commit is contained in:
alexey.lysiuk 2020-01-31 13:21:14 +02:00 committed by drfrag
parent 36cb6b7050
commit c088d1ec01
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/p_plats.cpp
View file

@ -80,6 +80,11 @@ void DPlat::PlayPlatSound (const char *sound)
}
}
const char *DPlat::GetSoundByType () const
{
return m_Type == platDownWaitUpStayStone ? "Floor" : "Platform";
}
//
// Move a plat up and down
//
@ -96,7 +101,7 @@ void DPlat::Tick ()
{
m_Count = m_Wait;
m_Status = down;
PlayPlatSound ("Platform");
PlayPlatSound (GetSoundByType ());
}
else if (res == EMoveResult::pastdest)
{
@ -167,7 +172,7 @@ void DPlat::Tick ()
{
m_Status = up;
m_Count = m_Wait;
PlayPlatSound ("Platform");
PlayPlatSound (GetSoundByType ());
}
//jff 1/26/98 remove the plat if it bounced so it can be tried again
@ -197,7 +202,7 @@ void DPlat::Tick ()
if (m_Type == platToggle)
SN_StartSequence (m_Sector, CHAN_FLOOR, "Silence", 0);
else
PlayPlatSound ("Platform");
PlayPlatSound (GetSoundByType ());
}
break;
@ -316,7 +321,7 @@ bool EV_DoPlat (int tag, line_t *line, DPlat::EPlatType type, double height,
plat->m_High = sec->floorplane.fD();
plat->m_Status = DPlat::down;
plat->PlayPlatSound (type == DPlat::platDownWaitUpStay ? "Platform" : "Floor");
plat->PlayPlatSound (plat->GetSoundByType ());
break;
case DPlat::platUpNearestWaitDownStay:

1
src/p_spec.h
View file

@ -213,6 +213,7 @@ protected:
EPlatType m_Type;
void PlayPlatSound (const char *sound);
const char *GetSoundByType () const;
void Reactivate ();
void Stop ();