2 files changed, 8 insertions, 11 deletions
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 9027cb51..7ccb6826 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -52,6 +52,7 @@ boolean noartiskip;             // whether shift-enter skips an artifact
 skill_t startskill;
 int startepisode;
 int startmap;
+int UpdateState;
 boolean autostart;
 extern boolean automapactive;
 
@@ -184,7 +185,7 @@ void D_Display(void)
     NetUpdate();
 
     // Flush buffered stuff to screen
-    I_Update();
+    I_FinishUpdate();
 }
 
 //---------------------------------------------------------------------------
diff --git a/src/heretic/s_sound.c b/src/heretic/s_sound.c
index baed0dde..c38c5938 100644
--- a/src/heretic/s_sound.c
+++ b/src/heretic/s_sound.c
@@ -57,9 +57,9 @@ extern musicinfo_t S_music[];
 
 extern int snd_DesiredMusicDevice;
 extern int snd_DesiredSfxDevice;
-extern int snd_MaxVolume;
-extern int snd_MusicVolume;
-extern int snd_Channels;
+int snd_MaxVolume;
+int snd_MusicVolume;
+int snd_Channels;
 
 extern int startepisode;
 extern int startmap;
@@ -566,12 +566,8 @@ void S_SetMusicVolume(void)
 
 void S_ShutDown(void)
 {
-    extern int tsm_ID;
-    if (tsm_ID != -1)
-    {
-        I_StopSong();
-        I_UnRegisterSong(rs);
-        I_ShutdownSound();
-    }
+    I_StopSong();
+    I_UnRegisterSong(rs);
+    I_ShutdownSound();
 }