zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- DMessageBoxMenu is fully scriptified.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-18 23:39:02 +01:00
parent 62b594a499
commit e46571c192
3 changed files with 62 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
src/menu/messagebox.cpp
View file

@ -46,97 +46,8 @@
#include "c_dispatch.h" #include "c_dispatch.h"
#include "g_game.h" #include "g_game.h"
class DBrokenLines : public DObject
{
DECLARE_ABSTRACT_CLASS(DBrokenLines, DObject)
public:
FBrokenLines *mBroken;
unsigned int mCount;
DBrokenLines(FBrokenLines *broken, unsigned int count)
{
mBroken = broken;
mCount = count;
}
void OnDestroy() override
{
V_FreeBrokenLines(mBroken);
}
};
EXTERN_CVAR (Bool, saveloadconfirmation) // [mxd] EXTERN_CVAR (Bool, saveloadconfirmation) // [mxd]
class DMessageBoxMenu : public DMenu
{
DECLARE_CLASS(DMessageBoxMenu, DMenu)
public:
DBrokenLines *mMessage;
int mMessageMode;
int messageSelection;
int mMouseLeft, mMouseRight, mMouseY;
FName mAction;
void (*Handler)();
public:
DMessageBoxMenu(DMenu *parent = NULL, const char *message = NULL, int messagemode = 0, bool playsound = false, FName action = NAME_None, void (*hnd)() = nullptr);
void Init(DMenu *parent, const char *message, int messagemode, bool playsound = false, void(*hnd)() = nullptr);
};
IMPLEMENT_CLASS(DMessageBoxMenu, false, false)
//=============================================================================
//
//
//
//=============================================================================
DMessageBoxMenu::DMessageBoxMenu(DMenu *parent, const char *message, int messagemode, bool playsound, FName action, void (*hnd)())
: DMenu(parent)
{
mAction = action;
messageSelection = 0;
mMouseLeft = 140;
mMouseY = INT_MIN;
int mr1 = 170 + SmallFont->StringWidth(GStrings["TXT_YES"]);
int mr2 = 170 + SmallFont->StringWidth(GStrings["TXT_NO"]);
mMouseRight = MAX(mr1, mr2);
Init(parent, message, messagemode, playsound, hnd);
}
//=============================================================================
//
//
//
//=============================================================================
void DMessageBoxMenu::Init(DMenu *parent, const char *message, int messagemode, bool playsound, void (*hnd)())
{
mParentMenu = parent;
if (message != NULL)
{
if (*message == '$') message = GStrings(message+1);
unsigned count;
auto Message = V_BreakLines(SmallFont, 300, message, true, &count);
mMessage = new DBrokenLines(Message, count);
GC::WriteBarrier(mMessage);
mMessage->ObjectFlags |= OF_Fixed;
}
else mMessage = NULL;
mMessageMode = messagemode;
if (playsound)
{
S_StopSound (CHAN_VOICE);
S_Sound (CHAN_VOICE | CHAN_UI, "menu/prompt", snd_menuvolume, ATTN_NONE);
}
Handler = hnd;
}
typedef void(*hfunc)(); typedef void(*hfunc)();
DEFINE_ACTION_FUNCTION(DMessageBoxMenu, CallHandler) DEFINE_ACTION_FUNCTION(DMessageBoxMenu, CallHandler)
{ {
@ -152,6 +63,23 @@ DEFINE_ACTION_FUNCTION(DMessageBoxMenu, CallHandler)
// //
//============================================================================= //=============================================================================
DMenu *CreateMessageBoxMenu(DMenu *parent, const char *message, int messagemode, bool playsound, FName action = NAME_None, hfunc handler = nullptr)
{
auto c = PClass::FindClass("MessageBoxMenu");
auto p = c->CreateNew();
VMValue params[] = { p, parent, FString(message), messagemode, playsound, action.GetIndex(), handler };
auto f = dyn_cast<PFunction>(c->Symbols.FindSymbol("Init", false));
GlobalVMStack.Call(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
return (DMenu*)p;
}
//=============================================================================
//
//
//
//=============================================================================
CCMD (menu_quit) CCMD (menu_quit)
{ // F10 { // F10
M_StartControlPanel (true); M_StartControlPanel (true);
@ -172,7 +100,7 @@ CCMD (menu_quit)
} }
else EndString = gameinfo.quitmessages[messageindex]; else EndString = gameinfo.quitmessages[messageindex];
DMenu *newmenu = new DMessageBoxMenu(CurrentMenu, EndString, 0, false, NAME_None, []() DMenu *newmenu = CreateMessageBoxMenu(CurrentMenu, EndString, 0, false, NAME_None, []()
{ {
if (!netgame) if (!netgame)
{ {
@ -209,7 +137,7 @@ CCMD (menu_endgame)
S_Sound (CHAN_VOICE | CHAN_UI, "menu/activate", snd_menuvolume, ATTN_NONE); S_Sound (CHAN_VOICE | CHAN_UI, "menu/activate", snd_menuvolume, ATTN_NONE);
FString tempstring = GStrings(netgame ? "NETEND" : "ENDGAME"); FString tempstring = GStrings(netgame ? "NETEND" : "ENDGAME");
DMenu *newmenu = new DMessageBoxMenu(CurrentMenu, tempstring, 0, false, NAME_None, []() DMenu *newmenu = CreateMessageBoxMenu(CurrentMenu, tempstring, 0, false, NAME_None, []()
{ {
M_ClearMenus(); M_ClearMenus();
if (!netgame) if (!netgame)
@ -258,7 +186,7 @@ CCMD (quicksave)
FString tempstring; FString tempstring;
tempstring.Format(GStrings("QSPROMPT"), savegameManager.quickSaveSlot->SaveTitle.GetChars()); tempstring.Format(GStrings("QSPROMPT"), savegameManager.quickSaveSlot->SaveTitle.GetChars());
DMenu *newmenu = new DMessageBoxMenu(CurrentMenu, tempstring, 0, false, NAME_None, []() DMenu *newmenu = CreateMessageBoxMenu(CurrentMenu, tempstring, 0, false, NAME_None, []()
{ {
G_SaveGame(savegameManager.quickSaveSlot->Filename.GetChars(), savegameManager.quickSaveSlot->SaveTitle.GetChars()); G_SaveGame(savegameManager.quickSaveSlot->Filename.GetChars(), savegameManager.quickSaveSlot->SaveTitle.GetChars());
S_Sound(CHAN_VOICE | CHAN_UI, "menu/dismiss", snd_menuvolume, ATTN_NONE); S_Sound(CHAN_VOICE | CHAN_UI, "menu/dismiss", snd_menuvolume, ATTN_NONE);
@ -303,7 +231,7 @@ CCMD (quickload)
M_StartControlPanel(true); M_StartControlPanel(true);
DMenu *newmenu = new DMessageBoxMenu(CurrentMenu, tempstring, 0, false, NAME_None, []() DMenu *newmenu = CreateMessageBoxMenu(CurrentMenu, tempstring, 0, false, NAME_None, []()
{ {
G_LoadGame(savegameManager.quickSaveSlot->Filename.GetChars()); G_LoadGame(savegameManager.quickSaveSlot->Filename.GetChars());
S_Sound(CHAN_VOICE | CHAN_UI, "menu/dismiss", snd_menuvolume, ATTN_NONE); S_Sound(CHAN_VOICE | CHAN_UI, "menu/dismiss", snd_menuvolume, ATTN_NONE);
@ -325,7 +253,7 @@ void M_StartMessage(const char *message, int messagemode, FName action)
// only play a sound if no menu was active before // only play a sound if no menu was active before
M_StartControlPanel(menuactive == MENU_Off); M_StartControlPanel(menuactive == MENU_Off);
} }
DMenu *newmenu = new DMessageBoxMenu(CurrentMenu, message, messagemode, false, action); DMenu *newmenu = CreateMessageBoxMenu(CurrentMenu, message, messagemode, false, action);
newmenu->mParentMenu = CurrentMenu; newmenu->mParentMenu = CurrentMenu;
M_ActivateMenu(newmenu); M_ActivateMenu(newmenu);
} }
@ -339,13 +267,3 @@ DEFINE_ACTION_FUNCTION(DMenu, StartMessage)
M_StartMessage(msg, mode, action); M_StartMessage(msg, mode, action);
return 0; return 0;
} }
DEFINE_FIELD(DMessageBoxMenu, mMessageMode);
DEFINE_FIELD(DMessageBoxMenu, messageSelection);
DEFINE_FIELD(DMessageBoxMenu, mMouseLeft);
DEFINE_FIELD(DMessageBoxMenu, mMouseRight);
DEFINE_FIELD(DMessageBoxMenu, mMouseY);
DEFINE_FIELD(DMessageBoxMenu, mAction);
DEFINE_FIELD(DMessageBoxMenu, Handler);
DEFINE_FIELD(DMessageBoxMenu, mMessage);

16
wadsrc/static/zscript/base.txt
View file

@ -171,13 +171,6 @@ struct Screen native
native static void DrawFrame(int x, int y, int w, int h); native static void DrawFrame(int x, int y, int w, int h);
} }
class BrokenLines : Object native
{
native int Count();
native int StringWidth(int line);
native String StringAt(int line);
}
struct Font native struct Font native
{ {
enum EColorRange enum EColorRange
@ -248,7 +241,7 @@ struct Font native
native static int FindFontColor(Name color); native static int FindFontColor(Name color);
native static Font FindFont(Name fontname); native static Font FindFont(Name fontname);
native static Font GetFont(Name fontname); native static Font GetFont(Name fontname);
native static BrokenLines BreakLines(String text, int maxlen); native BrokenLines BreakLines(String text, int maxlen);
} }
struct Translation struct Translation
@ -332,6 +325,13 @@ class Object native
virtual void OnDestroy() {} virtual void OnDestroy() {}
} }
class BrokenLines : Object native
{
native int Count();
native int StringWidth(int line);
native String StringAt(int line);
}
class Thinker : Object native class Thinker : Object native
{ {
enum EStatnums enum EStatnums

53
wadsrc/static/zscript/menu/messagebox.txt
View file

@ -32,14 +32,14 @@
** **
*/ */
class MessageBoxMenu : Menu native class MessageBoxMenu : Menu
{ {
native BrokenLines mMessage; BrokenLines mMessage;
native voidptr Handler; voidptr Handler;
native int mMessageMode; int mMessageMode;
native int messageSelection; int messageSelection;
native int mMouseLeft, mMouseRight, mMouseY; int mMouseLeft, mMouseRight, mMouseY;
native Name mAction; Name mAction;
native static void CallHandler(voidptr hnd); native static void CallHandler(voidptr hnd);
@ -50,12 +50,26 @@ class MessageBoxMenu : Menu native
// //
//============================================================================= //=============================================================================
override void OnDestroy() void Init(Menu parent, String message, int messagemode, bool playsound = false, Name cmd = 'None', voidptr native_handler = null)
{ {
mMessage.Destroy(); // explicitly free the strings now. Super.Init(parent);
Super.OnDestroy(); mAction = cmd;
messageSelection = 0;
mMouseLeft = 140;
mMouseY = 0x80000000;
int mr1 = 170 + SmallFont.StringWidth(Stringtable.Localize("$TXT_YES"));
int mr2 = 170 + SmallFont.StringWidth(Stringtable.Localize("TXT_NO"));
mMouseRight = MAX(mr1, mr2);
mParentMenu = parent;
mMessage = SmallFont.BreakLines(message, 300);
mMessageMode = messagemode;
if (playsound)
{
MenuSound ("menu/prompt");
}
Handler = native_handler;
} }
//============================================================================= //=============================================================================
// //
// //
@ -70,17 +84,14 @@ class MessageBoxMenu : Menu native
y = 100; y = 100;
if (mMessage != NULL) int c = mMessage.Count();
{ for (i = 0; i < c; i++)
int c = mMessage.Count(); y -= SmallFont.GetHeight () / 2;
for (i = 0; i < c; i++)
y -= SmallFont.GetHeight () / 2;
for (i = 0; i < c; i++) for (i = 0; i < c; i++)
{ {
screen.DrawText (SmallFont, Font.CR_UNTRANSLATED, 160 - mMessage.StringWidth(i)/2, y, mMessage.StringAt(i), DTA_Clean, true); screen.DrawText (SmallFont, Font.CR_UNTRANSLATED, 160 - mMessage.StringWidth(i)/2, y, mMessage.StringAt(i), DTA_Clean, true);
y += fontheight; y += fontheight;
}
} }
if (mMessageMode == 0) if (mMessageMode == 0)