diff options
| author | James Haley | 2010-08-30 02:38:44 +0000 |
|---|---|---|
| committer | James Haley | 2010-08-30 02:38:44 +0000 |
| commit | a1497b9f334e35cb9214891a62a08fdb6137b82c (patch) | |
| tree | 492e9bbc333bde6c061d9f7a7b337b43377b835d /src/strife/m_menu.c | |
| parent | 543d06e80da825cb5630501035c479dc36e2a9df (diff) | |
| download | chocolate-doom-a1497b9f334e35cb9214891a62a08fdb6137b82c.tar.gz chocolate-doom-a1497b9f334e35cb9214891a62a08fdb6137b82c.tar.bz2 chocolate-doom-a1497b9f334e35cb9214891a62a08fdb6137b82c.zip | |
Added declaration and definition of menupause variable. Also uncommented
sound play in P_MoveWall since it's a sound that's shared with DOOM :)
Subversion-branch: /branches/strife-branch
Subversion-revision: 1975
Diffstat (limited to 'src/strife/m_menu.c')
| -rw-r--r-- | src/strife/m_menu.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c index 281556e4..39dc66ec 100644 --- a/src/strife/m_menu.c +++ b/src/strife/m_menu.c @@ -123,8 +123,9 @@ int saveCharIndex; // which char we're editing // old save description before edit char saveOldString[SAVESTRINGSIZE]; -boolean inhelpscreens; -boolean menuactive; +boolean inhelpscreens; +boolean menuactive; +boolean menupause; // haleyjd 08/29/10: [STRIFE] New global // haleyjd 08/27/10: [STRIFE] SKULLXOFF == -28, LINEHEIGHT == 19 #define CURSORXOFF -28 @@ -1673,11 +1674,8 @@ boolean M_Responder (event_t* ev) else if (key == key_menu_help) // Help key { M_StartControlPanel (); - - if ( gamemode == retail ) - currentMenu = &ReadDef2; - else - currentMenu = &ReadDef1; + // haleyjd 08/29/10: [STRIFE] always ReadDef1 + currentMenu = &ReadDef1; itemOn = 0; S_StartSound(NULL,sfx_swtchn); |