zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/Raze

Browse source
This commit is contained in:
Christoph Oelckers 2020-02-26 17:38:03 +01:00
commit bf4ac0a5c0
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/exhumed/src/sound.cpp
View file

@ -345,7 +345,7 @@ void StartSwirly(int nActiveSound)
nVolume = 220; nVolume = 220;
soundEngine->StopSound(SOURCE_Swirly, &swirly, -1); soundEngine->StopSound(SOURCE_Swirly, &swirly, -1);
soundEngine->StartSound(SOURCE_Swirly, &fakesources[nActiveSound-1], nullptr, CHAN_BODY, 0, StaticSound[kSoundMana1]+1, nVolume / 255.f, ATTN_NONE, nullptr, nPitch / 11025.f); soundEngine->StartSound(SOURCE_Swirly, &swirly, nullptr, CHAN_BODY, 0, StaticSound[kSoundMana1]+1, nVolume / 255.f, ATTN_NONE, nullptr, nPitch / 11025.f);
} }
//========================================================================== //==========================================================================

3
source/sw/src/panel.cpp
View file

@ -775,9 +775,6 @@ void PlayerUpdatePanelInfo(PLAYERp pp)
if (Prediction) if (Prediction)
return; return;
if (M_Active())
return;
PlayerUpdateHealth(pp, 0); PlayerUpdateHealth(pp, 0);
PlayerUpdateInventory(pp, pp->InventoryNum); PlayerUpdateInventory(pp, pp->InventoryNum);
PlayerUpdateAmmo(pp, u->WeaponNum, 0); PlayerUpdateAmmo(pp, u->WeaponNum, 0);