mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 11:10:47 +00:00
- final fixes for Blood's and Duke Nukem's menus.
This commit is contained in:
parent
a0fe7f4048
commit
66756bfa13
14 changed files with 77 additions and 33 deletions
|
@ -99,6 +99,7 @@ struct GameInterface : ::GameInterface
|
||||||
bool LoadGame(FSaveGameNode*) override;
|
bool LoadGame(FSaveGameNode*) override;
|
||||||
void DoPrintMessage(int prio, const char*) override;
|
void DoPrintMessage(int prio, const char*) override;
|
||||||
void DrawCenteredTextScreen(const DVector2& origin, const char* text, int position, bool bg);
|
void DrawCenteredTextScreen(const DVector2& origin, const char* text, int position, bool bg);
|
||||||
|
void QuitToTitle() override;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -284,12 +284,32 @@ void GameInterface::DrawCenteredTextScreen(const DVector2& origin, const char* t
|
||||||
{
|
{
|
||||||
if (text)
|
if (text)
|
||||||
{
|
{
|
||||||
int width;
|
int width, height = 0;
|
||||||
viewGetFontInfo(0, text, &width, NULL);
|
viewGetFontInfo(0, "T", &width, &height);
|
||||||
|
|
||||||
|
auto lines = FString(text).Split("\n");
|
||||||
|
int y = 100 - (height * lines.Size() / 2);
|
||||||
|
for (auto& l : lines)
|
||||||
|
{
|
||||||
|
int lheight = 0;
|
||||||
|
viewGetFontInfo(0, l, &width, &lheight);
|
||||||
int x = 160 - width / 2;
|
int x = 160 - width / 2;
|
||||||
viewDrawText(0, text, x, 100, 0, 0, 0, false);
|
viewDrawText(0, l, x, y, 0, 0, 0, false);
|
||||||
|
y += height;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void GameInterface::QuitToTitle()
|
||||||
|
{
|
||||||
|
if (gGameOptions.nGameType == 0 || numplayers == 1)
|
||||||
|
{
|
||||||
|
gQuitGame = true;
|
||||||
|
gRestartGame = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
gQuitRequest = 2;
|
||||||
|
}
|
||||||
|
|
||||||
END_BLD_NS
|
END_BLD_NS
|
||||||
|
|
||||||
|
|
|
@ -237,6 +237,8 @@ struct GameInterface
|
||||||
DoPrintMessage(prio, f);
|
DoPrintMessage(prio, f);
|
||||||
}
|
}
|
||||||
virtual void DrawPlayerSprite(const DVector2& origin, bool onteam) {}
|
virtual void DrawPlayerSprite(const DVector2& origin, bool onteam) {}
|
||||||
|
virtual void QuitToTitle() {}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
extern GameInterface* gi;
|
extern GameInterface* gi;
|
||||||
|
|
|
@ -498,7 +498,7 @@ bool M_SetMenu(FName menu, int param, FName caller)
|
||||||
|
|
||||||
case NAME_EndgameMenu:
|
case NAME_EndgameMenu:
|
||||||
// This is no separate class
|
// This is no separate class
|
||||||
C_DoCommand("memnu_endgame");
|
C_DoCommand("menu_endgame");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -806,7 +806,7 @@ bool M_DoResponder (event_t *ev)
|
||||||
|
|
||||||
bool M_Responder(event_t* ev)
|
bool M_Responder(event_t* ev)
|
||||||
{
|
{
|
||||||
// delayed deletion, so that self-deleting menus don't crash if they are getting accesses after being closed.
|
// delayed deletion, so that self-deleting menus don't crash if they are getting accessed after being closed.
|
||||||
auto res = M_DoResponder(ev);
|
auto res = M_DoResponder(ev);
|
||||||
for (auto p : toDelete) delete p;
|
for (auto p : toDelete) delete p;
|
||||||
toDelete.Clear();
|
toDelete.Clear();
|
||||||
|
@ -827,6 +827,7 @@ void M_Ticker (void)
|
||||||
{
|
{
|
||||||
D_ProcessEvents(); // The main loop is blocked when the menu is open and cannot dispatch the events.
|
D_ProcessEvents(); // The main loop is blocked when the menu is open and cannot dispatch the events.
|
||||||
if (transition.previous) transition.previous->Ticker();
|
if (transition.previous) transition.previous->Ticker();
|
||||||
|
if (DMenu::CurrentMenu == nullptr) return; // In case one of the sub-screens has closed the menu.
|
||||||
DMenu::CurrentMenu->Ticker();
|
DMenu::CurrentMenu->Ticker();
|
||||||
|
|
||||||
for (int i = 0; i < NUM_MKEYS; ++i)
|
for (int i = 0; i < NUM_MKEYS; ++i)
|
||||||
|
|
|
@ -407,17 +407,7 @@ CCMD (menu_endgame)
|
||||||
{
|
{
|
||||||
if (res)
|
if (res)
|
||||||
{
|
{
|
||||||
M_ClearMenus();
|
gi->QuitToTitle();
|
||||||
/*/
|
|
||||||
if (!netgame)
|
|
||||||
{
|
|
||||||
if (demorecording)
|
|
||||||
G_CheckDemoStatus();
|
|
||||||
D_StartTitle();
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
//gi->ReturnToTitle();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -754,6 +754,15 @@ bool GameInterface::DrawSpecialScreen(const DVector2 &origin, int tilenum)
|
||||||
void GameInterface::DrawCenteredTextScreen(const DVector2 &origin, const char *text, int position, bool bg)
|
void GameInterface::DrawCenteredTextScreen(const DVector2 &origin, const char *text, int position, bool bg)
|
||||||
{
|
{
|
||||||
if (bg) Menu_DrawBackground(origin);
|
if (bg) Menu_DrawBackground(origin);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Only used for the confirmation screen.
|
||||||
|
int lines = 1;
|
||||||
|
for (int i = 0; text[i]; i++) if (text[i] == '\n') lines++;
|
||||||
|
int height = lines * Menu_GetFontHeight(NIT_SmallFont);
|
||||||
|
position -= height >> 17;
|
||||||
|
Menu_DrawCursorLeft(160 << 16, 130 << 16, 65536);
|
||||||
|
}
|
||||||
mgametextcenter(int(origin.X * 65536), int((origin.Y + position) * 65536), text);
|
mgametextcenter(int(origin.X * 65536), int((origin.Y + position) * 65536), text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -762,6 +771,13 @@ void GameInterface::DrawPlayerSprite(const DVector2& origin, bool onteam)
|
||||||
rotatesprite_fs(int(origin.X * 65536) + (260<<16), int(origin.Y*65536) + ((24+(tilesiz[APLAYER].y>>1))<<16), 49152L,0,1441-((((4-((int32_t) totalclock>>4)))&3)*5),0,onteam ? G_GetTeamPalette(playerteam) : G_CheckPlayerColor(playercolor),10);
|
rotatesprite_fs(int(origin.X * 65536) + (260<<16), int(origin.Y*65536) + ((24+(tilesiz[APLAYER].y>>1))<<16), 49152L,0,1441-((((4-((int32_t) totalclock>>4)))&3)*5),0,onteam ? G_GetTeamPalette(playerteam) : G_CheckPlayerColor(playercolor),10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GameInterface::QuitToTitle()
|
||||||
|
{
|
||||||
|
g_player[myconnectindex].ps->gm = MODE_DEMO;
|
||||||
|
if (ud.recstat == 1)
|
||||||
|
G_CloseDemoWrite();
|
||||||
|
artClearMapArt();
|
||||||
|
}
|
||||||
END_DUKE_NS
|
END_DUKE_NS
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
|
@ -170,6 +170,7 @@ struct GameInterface : ::GameInterface
|
||||||
bool LoadGame(FSaveGameNode*) override;
|
bool LoadGame(FSaveGameNode*) override;
|
||||||
void DoPrintMessage(int prio, const char*) override;
|
void DoPrintMessage(int prio, const char*) override;
|
||||||
void DrawPlayerSprite(const DVector2& origin, bool onteam) override;
|
void DrawPlayerSprite(const DVector2& origin, bool onteam) override;
|
||||||
|
void QuitToTitle() override;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -6165,6 +6165,11 @@ MAIN_LOOP_RESTART:
|
||||||
do //main loop
|
do //main loop
|
||||||
{
|
{
|
||||||
gameHandleEvents();
|
gameHandleEvents();
|
||||||
|
if (myplayer.gm == MODE_DEMO)
|
||||||
|
{
|
||||||
|
M_ClearMenus();
|
||||||
|
goto MAIN_LOOP_RESTART;
|
||||||
|
}
|
||||||
|
|
||||||
// only allow binds to function if the player is actually in a game (not in a menu, typing, et cetera) or demo
|
// only allow binds to function if the player is actually in a game (not in a menu, typing, et cetera) or demo
|
||||||
inputState.SetBindsEnabled(!!(myplayer.gm & (MODE_GAME|MODE_DEMO)));
|
inputState.SetBindsEnabled(!!(myplayer.gm & (MODE_GAME|MODE_DEMO)));
|
||||||
|
|
|
@ -74,19 +74,6 @@ void Menu_Init(void)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void Menu_DrawVerifyPrompt(int32_t x, int32_t y, const char * text, int numlines = 1)
|
|
||||||
{
|
|
||||||
mgametextcenter(x, y + (90<<16), text);
|
|
||||||
#ifndef EDUKE32_ANDROID_MENU
|
|
||||||
char const * inputs = CONTROL_LastSeenInput == LastSeenInput::Joystick
|
|
||||||
? "Press (A) to accept, (B) to return."
|
|
||||||
: "(Y/N)";
|
|
||||||
mgametextcenter(x, y + (90<<16) + MF_Bluefont.get_yline() * numlines, inputs);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
|
static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
|
||||||
{
|
{
|
||||||
int32_t i, j, l = 0;
|
int32_t i, j, l = 0;
|
||||||
|
|
|
@ -469,6 +469,14 @@ void GameInterface::DrawMenuCaption(const DVector2& origin, const char* text)
|
||||||
void GameInterface::DrawCenteredTextScreen(const DVector2 &origin, const char *text, int position, bool bg)
|
void GameInterface::DrawCenteredTextScreen(const DVector2 &origin, const char *text, int position, bool bg)
|
||||||
{
|
{
|
||||||
if (bg) Menu_DrawBackground(origin);
|
if (bg) Menu_DrawBackground(origin);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Only used for the confirmation screen.
|
||||||
|
int lines = 1;
|
||||||
|
for (int i = 0; text[i]; i++) if (text[i] == '\n') lines++;
|
||||||
|
int height = lines * Menu_GetFontHeight(NIT_SmallFont);
|
||||||
|
position -= height >> 17;
|
||||||
|
}
|
||||||
G_ScreenText(MF_Bluefont.tilenum, int((origin.X + 160) * 65536), int((origin.Y + position) * 65536), MF_Bluefont.zoom, 0, 0, text, 0, MF_Bluefont.pal,
|
G_ScreenText(MF_Bluefont.tilenum, int((origin.X + 160) * 65536), int((origin.Y + position) * 65536), MF_Bluefont.zoom, 0, 0, text, 0, MF_Bluefont.pal,
|
||||||
2 | 8 | 16 | ROTATESPRITE_FULL16, 0, MF_Bluefont.emptychar.x, MF_Bluefont.emptychar.y, MF_Bluefont.between.x, MF_Bluefont.between.y,
|
2 | 8 | 16 | ROTATESPRITE_FULL16, 0, MF_Bluefont.emptychar.x, MF_Bluefont.emptychar.y, MF_Bluefont.between.x, MF_Bluefont.between.y,
|
||||||
MF_Bluefont.textflags | TEXT_XCENTER, 0, 0, xdim - 1, ydim - 1);
|
MF_Bluefont.textflags | TEXT_XCENTER, 0, 0, xdim - 1, ydim - 1);
|
||||||
|
@ -483,6 +491,13 @@ void GameInterface::DrawPlayerSprite(const DVector2& origin, bool onteam)
|
||||||
rotatesprite_fs(int(origin.X * 65536) + (260<<16), int(origin.Y * 65536) + ((24+(tilesiz[APLAYER].y>>1))<<16), 49152L,0,1441-((((4-((int32_t) totalclock>>4)))&3)*5),0,onteam ? G_GetTeamPalette(playerteam) : G_CheckPlayerColor(playercolor),10);
|
rotatesprite_fs(int(origin.X * 65536) + (260<<16), int(origin.Y * 65536) + ((24+(tilesiz[APLAYER].y>>1))<<16), 49152L,0,1441-((((4-((int32_t) totalclock>>4)))&3)*5),0,onteam ? G_GetTeamPalette(playerteam) : G_CheckPlayerColor(playercolor),10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GameInterface::QuitToTitle()
|
||||||
|
{
|
||||||
|
g_player[myconnectindex].ps->gm = MODE_DEMO;
|
||||||
|
if (ud.recstat == 1)
|
||||||
|
G_CloseDemoWrite();
|
||||||
|
artClearMapArt();
|
||||||
|
}
|
||||||
|
|
||||||
END_RR_NS
|
END_RR_NS
|
||||||
|
|
||||||
|
|
|
@ -170,6 +170,7 @@ struct GameInterface : ::GameInterface
|
||||||
bool LoadGame(FSaveGameNode*) override;
|
bool LoadGame(FSaveGameNode*) override;
|
||||||
void DoPrintMessage(int prio, const char* text) override;
|
void DoPrintMessage(int prio, const char* text) override;
|
||||||
void DrawPlayerSprite(const DVector2& origin, bool onteam) override;
|
void DrawPlayerSprite(const DVector2& origin, bool onteam) override;
|
||||||
|
void QuitToTitle() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
END_RR_NS
|
END_RR_NS
|
||||||
|
|
|
@ -7598,6 +7598,11 @@ MAIN_LOOP_RESTART:
|
||||||
do //main loop
|
do //main loop
|
||||||
{
|
{
|
||||||
handleevents();
|
handleevents();
|
||||||
|
if (g_player[myconnectindex].ps->gm == MODE_DEMO)
|
||||||
|
{
|
||||||
|
M_ClearMenus();
|
||||||
|
goto MAIN_LOOP_RESTART;
|
||||||
|
}
|
||||||
|
|
||||||
Net_GetPackets();
|
Net_GetPackets();
|
||||||
|
|
||||||
|
|
|
@ -266,7 +266,7 @@ void GameInterface::DrawCenteredTextScreen(const DVector2& origin, const char* t
|
||||||
for (auto& l : lines)
|
for (auto& l : lines)
|
||||||
{
|
{
|
||||||
short lheight = 0;
|
short lheight = 0;
|
||||||
MNU_MeasureString(text, &width, &lheight);
|
MNU_MeasureString(l, &width, &lheight);
|
||||||
int x = 160 - width / 2;
|
int x = 160 - width / 2;
|
||||||
MNU_DrawString(x, y, l, 0, 0);
|
MNU_DrawString(x, y, l, 0, 0);
|
||||||
y += height;
|
y += height;
|
||||||
|
|
|
@ -105,7 +105,7 @@ LISTMENU "IngameMenu"
|
||||||
NativeTextItem "$MNU_LOADGAME", "l", "LoadGameMenu"
|
NativeTextItem "$MNU_LOADGAME", "l", "LoadGameMenu"
|
||||||
NativeTextItem "$MNU_OPTIONS", "o", "OptionsMenu"
|
NativeTextItem "$MNU_OPTIONS", "o", "OptionsMenu"
|
||||||
NativeTextItem "$MNU_HELP", "h", "HelpMenu"
|
NativeTextItem "$MNU_HELP", "h", "HelpMenu"
|
||||||
NativeTextItem "$MNU_ENDGAME", "e", "QuitToMenu"
|
NativeTextItem "$MNU_ENDGAME", "e", "EndgameMenu"
|
||||||
NativeTextItem "$MNU_QUITGAME", "q", "QuitMenu"
|
NativeTextItem "$MNU_QUITGAME", "q", "QuitMenu"
|
||||||
}
|
}
|
||||||
ifgame(Blood)
|
ifgame(Blood)
|
||||||
|
@ -121,7 +121,7 @@ LISTMENU "IngameMenu"
|
||||||
NativeTextItem "$MNU_LOADGAME", "l", "LoadGameMenu"
|
NativeTextItem "$MNU_LOADGAME", "l", "LoadGameMenu"
|
||||||
NativeTextItem "$MNU_HELP", "h", "HelpMenu"
|
NativeTextItem "$MNU_HELP", "h", "HelpMenu"
|
||||||
NativeTextItem "$MNU_CREDITS", "c", "CreditsMenu"
|
NativeTextItem "$MNU_CREDITS", "c", "CreditsMenu"
|
||||||
NativeTextItem "$MNU_ENDGAME", "e", "QuitToMenu"
|
NativeTextItem "$MNU_ENDGAME", "e", "EndgameMenu"
|
||||||
NativeTextItem "$MNU_QUITGAME", "q", "QuitMenu"
|
NativeTextItem "$MNU_QUITGAME", "q", "QuitMenu"
|
||||||
}
|
}
|
||||||
ifgame(ShadowWarrior)
|
ifgame(ShadowWarrior)
|
||||||
|
|
Loading…
Reference in a new issue