diff options
| -rw-r--r-- | src/strife/doomstat.h | 7 | ||||
| -rw-r--r-- | src/strife/m_menu.c | 12 | ||||
| -rw-r--r-- | src/strife/p_switch.c | 5 |
3 files changed, 11 insertions, 13 deletions
diff --git a/src/strife/doomstat.h b/src/strife/doomstat.h index 36579118..779987d0 100644 --- a/src/strife/doomstat.h +++ b/src/strife/doomstat.h @@ -138,9 +138,10 @@ extern int snd_DesiredSfxDevice; // status bar explicitely. extern boolean statusbaractive; -extern boolean automapactive; // In AutoMap mode? -extern boolean menuactive; // Menu overlayed? -extern boolean paused; // Game Pause? +extern boolean automapactive; // In AutoMap mode? +extern boolean menuactive; // Menu overlayed? +extern boolean menupause; // haleyjd 08/29/10: [STRIFE] +extern boolean paused; // Game Pause? extern boolean viewactive; 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); diff --git a/src/strife/p_switch.c b/src/strife/p_switch.c index b8d29e72..2dd3af62 100644 --- a/src/strife/p_switch.c +++ b/src/strife/p_switch.c @@ -268,10 +268,9 @@ P_ChangeSwitchTexture // // P_MoveWall // -// villsa [STRIFE] +// villsa [STRIFE] New function. // Dynamically move a solid line. Unused in Strife // - static void P_MoveWall(line_t *line, mobj_t *thing) { vertex_t *v2; @@ -281,7 +280,7 @@ static void P_MoveWall(line_t *line, mobj_t *thing) v1 = line->v1; v2 = line->v2; - //S_StartSound(thing, sfx_stnmov); [STRIFE] TODO - add sound + S_StartSound(thing, sfx_stnmov); if (line->dx) { |