zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-27 22:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: M_VerifyNightmare must use the selected skill level to start the

Browse source 
game, not always 4.


SVN r592 (trunk)
This commit is contained in:
Christoph Oelckers 2007-12-10 08:21:25 +00:00
parent b8827b1b86
commit 7d63937d7d
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/rh-log.txt
View file

@ -1,3 +1,7 @@
December 10, 2007 (Changes by Graf Zahl)
- Fixed: M_VerifyNightmare must use the selected skill level to start the
game, not always 4.
December 9, 2007 (Changes by Graf Zahl) December 9, 2007 (Changes by Graf Zahl)
- Fixed: There was no working means to pass 'no state' to A_Chase. - Fixed: There was no working means to pass 'no state' to A_Chase.
Now 0 or an empty string will do that. Now 0 or an empty string will do that.

5
src/m_menu.cpp
View file

@ -1723,12 +1723,14 @@ void M_DrawEpisode ()
} }
} }
static int confirmskill;
void M_VerifyNightmare (int ch) void M_VerifyNightmare (int ch)
{ {
if (ch != 'y') if (ch != 'y')
return; return;
G_DeferedInitNew (EpisodeMaps[epi], 4); G_DeferedInitNew (EpisodeMaps[epi], confirmskill);
if (gamestate == GS_FULLCONSOLE) if (gamestate == GS_FULLCONSOLE)
{ {
gamestate = GS_HIDECONSOLE; gamestate = GS_HIDECONSOLE;
@ -1744,6 +1746,7 @@ void M_ChooseSkill (int choice)
const char *msg = AllSkills[choice].MustConfirmText; const char *msg = AllSkills[choice].MustConfirmText;
if (*msg==0) msg = GStrings("NIGHTMARE"); if (*msg==0) msg = GStrings("NIGHTMARE");
if (*msg=='$') msg = GStrings(msg+1); if (*msg=='$') msg = GStrings(msg+1);
confirmskill = choice;
M_StartMessage (msg, M_VerifyNightmare, true); M_StartMessage (msg, M_VerifyNightmare, true);
return; return;
} }