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

- fixed summary screen properly this time.

Browse source 
Fixes #195
This commit is contained in:
Christoph Oelckers 2020-08-17 21:19:18 +02:00
parent 55de06ab2f
commit ba2ff12f5b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/sw/src/2d.cpp
View file

@ -387,10 +387,11 @@ private:
{ {
nextclock += synctics; nextclock += synctics;
if (State >= s_BonusRest && State < &s_BonusRest[countof(s_BonusRest)]) if (skiprequest && State >= s_BonusRest && State < &s_BonusRest[countof(s_BonusRest)])
{ {
State = s_BonusAnim[STD_RANDOM_RANGE(countof(s_BonusAnim))]; State = s_BonusAnim[STD_RANDOM_RANGE(countof(s_BonusAnim))];
Tics = 0; Tics = 0;
skiprequest = false;
} }
gStateControl(&State, &Tics); gStateControl(&State, &Tics);
} }
@ -422,7 +423,7 @@ private:
} }
// always read secrets and kills from the first player // always read secrets and kills from the first player
ds.Format("%s: %d / %d", GStrings("SECRETS"), Player->SecretsFound, LevelSecrets); ds.Format("%s: %d / %d", GStrings("TXT_SECRETS"), Player->SecretsFound, LevelSecrets);
MNU_DrawString(60, BONUS_LINE(line++), ds, 1, 16); MNU_DrawString(60, BONUS_LINE(line++), ds, 1, 16);
ds.Format("%s: %d / %d", GStrings("KILLS"), Player->Kills, TotalKillable); ds.Format("%s: %d / %d", GStrings("KILLS"), Player->Kills, TotalKillable);
@ -430,7 +431,7 @@ private:
MNU_DrawString(160, 185, GStrings("PRESSKEY"), 1, 19, 0); MNU_DrawString(160, 185, GStrings("PRESSKEY"), 1, 19, 0);
int ret = skiprequest ? -1 : 1; int ret = (State == State->NextState)? 0 : skiprequest ? -1 : 1;
if (ret != 1) StopSound(); if (ret != 1) StopSound();
return ret; return ret;
} }