From: Holger Schemel Date: Tue, 11 Dec 2018 22:48:50 +0000 (+0100) Subject: changed request dialog to disable virtual buttons instead of hiding them X-Git-Tag: 4.1.2.0~80 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=05f79aac9452f5666ee6dc712637adc1d9ae6b7a;p=rocksndiamonds.git changed request dialog to disable virtual buttons instead of hiding them --- diff --git a/src/libgame/system.c b/src/libgame/system.c index 0b9be20e..de973c73 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -417,6 +417,11 @@ void SetOverlayShowGrid(boolean show_grid) SetOverlayEnabled(TRUE); } +boolean GetOverlayEnabled(void) +{ + return overlay.enabled; +} + boolean GetOverlayActive(void) { return overlay.active; diff --git a/src/libgame/system.h b/src/libgame/system.h index 2f7c2bf6..0e67600c 100644 --- 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); +boolean GetOverlayEnabled(void); boolean GetOverlayActive(void); void SetDrawDeactivationMask(int); int GetDrawDeactivationMask(void); diff --git a/src/tools.c b/src/tools.c index 6522b8e7..2ff2a6e3 100644 --- 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 overlay_active = GetOverlayActive(); + boolean overlay_enabled = GetOverlayEnabled(); boolean result; - SetOverlayActive(FALSE); + SetOverlayEnabled(FALSE); if (global.use_envelope_request) result = RequestEnvelope(text, req_state); else result = RequestDoor(text, req_state); - SetOverlayActive(overlay_active); + SetOverlayEnabled(overlay_enabled); return result; }