changed request dialog to disable virtual buttons instead of hiding them

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 0b9be20e1b4cd209e2bc51ac20aa80bac9140c7e..de973c7316d69a9516a58c8bd505d6e5e069fe07 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -417,6 +417,11 @@ void SetOverlayShowGrid(boolean show_grid)
     SetOverlayEnabled(TRUE);
 }
 
     SetOverlayEnabled(TRUE);
 }
 

+boolean GetOverlayEnabled(void)
+{
+  return overlay.enabled;
+}
+

 boolean GetOverlayActive(void)
 {
   return overlay.active;
 boolean GetOverlayActive(void)
 {
   return overlay.active;

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 2f7c2bf61c42045463431d28355c48da02e94476..0e67600c6b478fa589f5c80ff850790aa7d66a97 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -1694,6 +1694,7 @@ void SetTileCursorSXSY(int, int);
 void SetOverlayEnabled(boolean);
 void SetOverlayActive(boolean);
 void SetOverlayShowGrid(boolean);
 void SetOverlayEnabled(boolean);
 void SetOverlayActive(boolean);
 void SetOverlayShowGrid(boolean);

+boolean GetOverlayEnabled(void);

 boolean GetOverlayActive(void);
 void SetDrawDeactivationMask(int);
 int GetDrawDeactivationMask(void);
 boolean GetOverlayActive(void);
 void SetDrawDeactivationMask(int);
 int GetDrawDeactivationMask(void);

diff --git a/src/tools.c b/src/tools.c
index 6522b8e741382bc55352fb961f2e4fc5149fdd03..2ff2a6e3a7450e00293d90a81ee25308167fa84a 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -4811,17 +4811,17 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
 
 boolean Request(char *text, unsigned int req_state)
 {
 
 boolean Request(char *text, unsigned int req_state)
 {

-  boolean overlay_active = GetOverlayActive();
+  boolean overlay_enabled = GetOverlayEnabled();

   boolean result;
 
   boolean result;
 

-  SetOverlayActive(FALSE);
+  SetOverlayEnabled(FALSE);

 
   if (global.use_envelope_request)
     result = RequestEnvelope(text, req_state);
   else
     result = RequestDoor(text, req_state);
 
 
   if (global.use_envelope_request)
     result = RequestEnvelope(text, req_state);
   else
     result = RequestDoor(text, req_state);
 

-  SetOverlayActive(overlay_active);
+  SetOverlayEnabled(overlay_enabled);

 
   return result;
 }
 
   return result;
 }