From 57dee80794dd9343f7038991ead3d92a2c34241a Mon Sep 17 00:00:00 2001
From: James Haley
Date: Wed, 8 Sep 2010 05:27:33 +0000
Subject: Functional menupause/menupausetime, fix to wait when there's not a
 background pic, and elimination of more dead code in the menu system

Subversion-branch: /branches/strife-branch
Subversion-revision: 2042
---
 src/strife/p_dialog.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/strife/p_dialog.c')

diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c
index a7e71a8c..ce906857 100644
--- a/src/strife/p_dialog.c
+++ b/src/strife/p_dialog.c
@@ -728,7 +728,7 @@ static void P_DialogDrawer(void)
         V_DrawPatchDirect(0, 0, patch);
     }
 
-    if(menupausetime <= gametic)
+    if(dialogbgpiclumpnum == -1 || menupausetime <= gametic)
     {
         if(menuindialog)
         {
@@ -778,7 +778,7 @@ static void P_DialogDrawer(void)
 // haleyjd 09/05/10: Handles making a choice in a dialog. Installed as the
 // callback for all items in the dialogmenu structure.
 //
-static void P_DialogDoChoice(int choice)
+void P_DialogDoChoice(int choice)
 {
     // STRIFE-TODO
 }
@@ -941,4 +941,5 @@ void P_DialogStart(player_t *player)
     }
 
     sprintf(dialoglastmsgbuffer, "%d) %s", i + 1, byetext);
-}
\ No newline at end of file
+}
+
-- 
cgit v1.2.3