zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use an FString to handle the new message.

Browse source
This commit is contained in:
Christoph Oelckers 2016-07-28 08:54:51 +02:00
parent 58a6d7df1f
commit 66006a5c14
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/menu/optionmenuitems.h
View file

@ -104,22 +104,13 @@ class FOptionMenuItemSafeCommand : public FOptionMenuItemCommand
{
// action is a CCMD
protected:
char *mPrompt;
FString mPrompt;
public:
FOptionMenuItemSafeCommand(const char *label, const char *menu, const char *prompt)
: FOptionMenuItemCommand(label, menu)
, mPrompt(nullptr)
, mPrompt(prompt)
{
if (prompt && *prompt)
{
mPrompt = copystring(prompt);
}
}
~FOptionMenuItemSafeCommand()
{
if (mPrompt != NULL) delete[] mPrompt;
}
bool MenuEvent (int mkey, bool fromcontroller)
@ -134,7 +125,7 @@ public:
bool Activate()
{
const char *msg = mPrompt ? mPrompt : "$SAFEMESSAGE";
const char *msg = mPrompt.IsNotEmpty() ? mPrompt.GetChars() : "$SAFEMESSAGE";
if (*msg == '$')
{
msg = GStrings(msg + 1);