ref: a1497b9f334e35cb9214891a62a08fdb6137b82c
parent: 543d06e80da825cb5630501035c479dc36e2a9df
author: James Haley <haleyjd@hotmail.com>
date: Sun Aug 29 22:38:44 EDT 2010
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
--- a/src/strife/doomstat.h
+++ b/src/strife/doomstat.h
@@ -138,9 +138,10 @@
// 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;
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -123,8 +123,9 @@
// 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 @@
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);
--- a/src/strife/p_switch.c
+++ b/src/strife/p_switch.c
@@ -268,10 +268,9 @@
//
// 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 @@
v1 = line->v1;
v2 = line->v2;
- //S_StartSound(thing, sfx_stnmov); [STRIFE] TODO - add sound
+ S_StartSound(thing, sfx_stnmov);
if (line->dx)
{