From 3412bdf5dc8e01afa7fb84b059d8fe1cc2759d67 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 26 Feb 2017 12:51:24 +0100 Subject: [PATCH] Revert "Fixed splitting of long lines in message box menu" This reverts commit 76a44ebf9cdef82a3d1dc08bd43e5a960163de54. Fix was done in the wrong place, it should be inside the script so that script-side calls to open a confirmation screen also get proper treatment. --- src/menu/messagebox.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/menu/messagebox.cpp b/src/menu/messagebox.cpp index a68bbc5f1..a1a0fda76 100644 --- a/src/menu/messagebox.cpp +++ b/src/menu/messagebox.cpp @@ -67,8 +67,7 @@ DMenu *CreateMessageBoxMenu(DMenu *parent, const char *message, int messagemode, { auto c = PClass::FindClass("MessageBoxMenu"); auto p = c->CreateNew(); - const FString msg = '$' == message[0] ? GStrings(message + 1) : message; - VMValue params[] = { p, parent, msg, messagemode, playsound, action.GetIndex(), reinterpret_cast(handler) }; + VMValue params[] = { p, parent, FString(message), messagemode, playsound, action.GetIndex(), reinterpret_cast(handler) }; auto f = dyn_cast(c->Symbols.FindSymbol("Init", false)); GlobalVMStack.Call(f->Variants[0].Implementation, params, countof(params), nullptr, 0);