zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-03-03 15:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke+RR: Don't quit the level summary screen through timeout when a sound is still playing.

Browse source 
Fixes #359
This commit is contained in:
Christoph Oelckers 2020-09-06 23:23:17 +02:00
parent 38cd38f0eb
commit cbbbe2a09b
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/duke/src/2d_d.cpp
View file

@ -924,7 +924,11 @@ public:
break; break;
} }
} }
else if (currentclock > (10240 + 120L)) return 0; else if (currentclock > (10240 + 120L))
{
if (!skiprequest && soundEngine->GetSoundPlayingInfo(SOURCE_None, nullptr, -1)) return 1;
return 0;
}
else else
{ {
switch((currentclock >> 5) & 3) switch((currentclock >> 5) & 3)

6
source/games/duke/src/2d_r.cpp
View file

@ -506,7 +506,11 @@ public:
} }
} }
} }
else if (currentclock > (10240 + 120L)) return 0; else if (currentclock > (10240 + 120L))
{
if (!skiprequest && soundEngine->GetSoundPlayingInfo(SOURCE_None, nullptr, -1)) return 1;
return 0;
}
if (currentclock > 10240 && currentclock < 10240 + 10240) if (currentclock > 10240 && currentclock < 10240 + 10240)
SetTotalClock(1024); SetTotalClock(1024);