From 71e330f910d9e803c08fe38c02c6828e71dda38f Mon Sep 17 00:00:00 2001
From: James Haley
Date: Tue, 31 Aug 2010 23:55:12 +0000
Subject: Replace M_NEWG with M_NGAME in menus, disable DOOM status bar, and
 get the proper music playing on all levels. This really feels like Strife now
 :)

Subversion-branch: /branches/strife-branch
Subversion-revision: 1990
---
 src/strife/m_menu.c   |  4 ++--
 src/strife/s_sound.c  | 42 +++++++++---------------------------------
 src/strife/st_stuff.c |  8 ++++++--
 3 files changed, 17 insertions(+), 37 deletions(-)

(limited to 'src')

diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c
index 5f2288c0..78ef8dfe 100644
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -926,11 +926,11 @@ void M_DrawMainMenu(void)
 //
 // M_NewGame
 //
-// haleyjd 08/27/10: [STRIFE] Verified unmodified.
+// haleyjd 08/31/10: [STRIFE] Changed M_NEWG -> M_NGAME
 //
 void M_DrawNewGame(void)
 {
-    V_DrawPatchDirect(96, 14, W_CacheLumpName(DEH_String("M_NEWG"), PU_CACHE));
+    V_DrawPatchDirect(96, 14, W_CacheLumpName(DEH_String("M_NGAME"), PU_CACHE));
     V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_SKILL"), PU_CACHE));
 }
 
diff --git a/src/strife/s_sound.c b/src/strife/s_sound.c
index c7d6a14f..6ea28afe 100644
--- a/src/strife/s_sound.c
+++ b/src/strife/s_sound.c
@@ -202,7 +202,9 @@ static void S_StopChannel(int cnum)
 // Kills playing sounds at start of level,
 //  determines music if any, changes music.
 //
-
+// haleyjd 08/31/10: [STRIFE]
+// * Removed DOOM music handling and replaced with Strife code.
+//
 void S_Start(void)
 {
     int cnum;
@@ -221,40 +223,14 @@ void S_Start(void)
     // start new music for the level
     mus_paused = 0;
 
-    if (gamemode == commercial)
-    {
-        mnum = mus_logo + gamemap - 1;  // villsa [STRIFE] TODO - fix music
-    }
+    // [STRIFE] Some interesting math here ;)
+    if(gamemap <= 31)
+        mnum = 1;
     else
-    {
-        // villsa [STRIFE] TODO - fix music
-        int spmus[]=
-        {
-            // Song - Who? - Where?
-
-            mus_logo,        // American     e4m1
-            mus_logo,        // Romero       e4m2
-            mus_logo,        // Shawn        e4m3
-            mus_logo,        // American     e4m4
-            mus_logo,        // Tim          e4m5
-            mus_logo,        // Romero       e4m6
-            mus_logo,        // J.Anderson   e4m7 CHIRON.WAD
-            mus_logo,        // Shawn        e4m8
-            mus_logo,        // Tim          e4m9
-        };
-
-        if (gameepisode < 4)
-        {
-            mnum = mus_logo + (gameepisode-1)*9 + gamemap-1;    // villsa [STRIFE] TODO - fix music
-        }
-        else
-        {
-            mnum = spmus[gamemap-1];
-        }
-    }        
+        mnum = -30;
 
-    S_ChangeMusic(mnum, true);
-}        
+    S_ChangeMusic(gamemap + mnum, true);
+}
 
 void S_StopSound(mobj_t *origin)
 {
diff --git a/src/strife/st_stuff.c b/src/strife/st_stuff.c
index 73b0cc92..fcaeabeb 100644
--- a/src/strife/st_stuff.c
+++ b/src/strife/st_stuff.c
@@ -1055,18 +1055,19 @@ void ST_diffDraw(void)
 
 void ST_Drawer (boolean fullscreen, boolean refresh)
 {
-  
     st_statusbaron = (!fullscreen) || automapactive;
     st_firsttime = st_firsttime || refresh;
 
     // Do red-/gold-shifts from damage/items
     ST_doPaletteStuff();
 
+    // haleyjd 08/31/10: STRIFE-TODO: disabled statbar drawing
+    /*
     // If just after ST_Start(), refresh all
     if (st_firsttime) ST_doRefresh();
     // Otherwise, update as little as possible
     else ST_diffDraw();
-
+    */
 }
 
 typedef void (*load_callback_t)(char *lumpname, patch_t **variable); 
@@ -1083,6 +1084,8 @@ static void ST_loadUnloadGraphics(load_callback_t callback)
     
     char	namebuf[9];
 
+    // haleyjd 08/31/10: STRIFE-TODO: Disabled statbar resource loading
+    /*
     // Load the numbers, tall and short
     for (i=0;i<10;i++)
     {
@@ -1158,6 +1161,7 @@ static void ST_loadUnloadGraphics(load_callback_t callback)
     ++facenum;
     callback(DEH_String("STFDEAD0"), &faces[facenum]);
     ++facenum;
+    */
 }
 
 static void ST_loadCallback(char *lumpname, patch_t **variable)
-- 
cgit v1.2.3