From 874b7df3aaac9335e7e3decb174bdd53707a6de1 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Tue, 30 Jan 2018 16:02:20 +0000 Subject: [PATCH] Remix r5063 git-svn-id: https://svn.eduke32.com/eduke32@6630 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/gamedef.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index eea0ec11d..c571c2688 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -2760,13 +2760,10 @@ void C_InitQuotes(void) #ifdef EDUKE32_TOUCH_DEVICES apStrings[QUOTE_DEAD] = 0; #else - char const * const replacement_USE = "USE"; - if (!Bstrstr(apStrings[QUOTE_DEAD], replacement_USE)) - { - C_ReplaceQuoteSubstring(QUOTE_DEAD, "SPACE", replacement_USE); - C_ReplaceQuoteSubstring(QUOTE_DEAD, "OPEN", replacement_USE); - C_ReplaceQuoteSubstring(QUOTE_DEAD, "ANY BUTTON", replacement_USE); - } + static constexpr char const * const OpenGameFunc = gamefunctions[gamefunc_Open]; + C_ReplaceQuoteSubstring(QUOTE_DEAD, "SPACE", OpenGameFunc); + C_ReplaceQuoteSubstring(QUOTE_DEAD, "OPEN", OpenGameFunc); + C_ReplaceQuoteSubstring(QUOTE_DEAD, "USE", OpenGameFunc); #endif // most of these are based on Blood, obviously