AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 11:35:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make menu options show (Still WIP), redesign PauseScreen to separate init/contextrecreated

Browse Source
This commit is contained in:
UnknownShadow200 2019-08-18 22:33:52 +10:00
parent b210c140e4
commit 467bac486c
6 changed files with 79 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Gui.c
View File

@ -20,9 +20,8 @@ GfxResourceID Gui_GuiTex, Gui_GuiClassicTex, Gui_IconsTex;
struct Screen* Gui_Status; struct Screen* Gui_Status;
struct Screen* Gui_HUD; struct Screen* Gui_HUD;
struct Screen* Gui_Active; struct Screen* Gui_Active;
struct Screen* Gui_Overlays[GUI_MAX_OVERLAYS];
struct Screen* Gui_Screens[GUI_MAX_SCREENS]; struct Screen* Gui_Screens[GUI_MAX_SCREENS];
int Gui_ScreensCount, Gui_OverlaysCount; int Gui_ScreensCount;
static uint8_t priorities[GUI_MAX_SCREENS]; static uint8_t priorities[GUI_MAX_SCREENS];
void Widget_SetLocation(void* widget, uint8_t horAnchor, uint8_t verAnchor, int xOffset, int yOffset) { void Widget_SetLocation(void* widget, uint8_t horAnchor, uint8_t verAnchor, int xOffset, int yOffset) {
@ -128,11 +127,7 @@ static void Gui_Init(void) {
} }
static void Gui_Reset(void) { static void Gui_Reset(void) {
int i; /* TODO:Should we reset all screens here.. ? */
for (i = 0; i < Gui_OverlaysCount; i++) {
Elem_TryFree(Gui_Overlays[i]);
}
Gui_OverlaysCount = 0;
} }
static void Gui_Free(void) { static void Gui_Free(void) {
@ -158,23 +153,12 @@ struct IGameComponent Gui_Component = {
}; };
struct Screen* Gui_GetActiveScreen(void) { struct Screen* Gui_GetActiveScreen(void) {
return Gui_OverlaysCount ? Gui_Overlays[0] : Gui_GetUnderlyingScreen();
}
struct Screen* Gui_GetUnderlyingScreen(void) {
return Gui_Active ? Gui_Active : Gui_HUD; return Gui_Active ? Gui_Active : Gui_HUD;
} }
void Gui_FreeActive(void) { void Gui_FreeActive(void) {
if (Gui_Active) { Elem_TryFree(Gui_Active); } if (Gui_Active) { Elem_TryFree(Gui_Active); }
} }
void Gui_Close(void* screen) {
struct Screen* s = (struct Screen*)screen;
if (s) { Elem_TryFree(s); }
if (s == Gui_Active) Gui_SetActive(NULL);
}
void Gui_CloseActive(void) { Gui_Close(Gui_Active); }
void Gui_SetActive(struct Screen* screen) { void Gui_SetActive(struct Screen* screen) {
InputHandler_ScreenChanged(Gui_Active, screen); InputHandler_ScreenChanged(Gui_Active, screen);
@ -292,28 +276,6 @@ struct Screen* Gui_GetClosable(void) {
return NULL; return NULL;
} }
int Gui_IndexOverlay(const void* screen) {
int i;
for (i = 0; i < Gui_OverlaysCount; i++) {
if (Gui_Overlays[i] == screen) return i;
}
return -1;
}
void Gui_RemoveOverlay(const void* screen) {
int i = Gui_IndexOverlay(screen);
if (i == -1) return;
for (; i < Gui_OverlaysCount - 1; i++) {
Gui_Overlays[i] = Gui_Overlays[i + 1];
}
Gui_OverlaysCount--;
Gui_Overlays[Gui_OverlaysCount] = NULL;
Camera_CheckFocus();
}
void Gui_RenderGui(double delta) { void Gui_RenderGui(double delta) {
struct Screen* s; struct Screen* s;
int i; int i;

14
src/Gui.h
View File

@ -109,11 +109,8 @@ extern struct Screen* Gui_Status;
extern struct Screen* Gui_HUD; extern struct Screen* Gui_HUD;
extern struct Screen* Gui_Active; extern struct Screen* Gui_Active;
#define GUI_MAX_SCREENS 10 #define GUI_MAX_SCREENS 10
#define GUI_MAX_OVERLAYS 4
extern struct Screen* Gui_Overlays[GUI_MAX_OVERLAYS];
extern struct Screen* Gui_Screens[GUI_MAX_SCREENS]; extern struct Screen* Gui_Screens[GUI_MAX_SCREENS];
extern int Gui_ScreensCount; extern int Gui_ScreensCount;
extern int Gui_OverlaysCount;
/* Calculates position of an element on a particular axis */ /* Calculates position of an element on a particular axis */
/* For example, to calculate X position of a text widget on screen */ /* For example, to calculate X position of a text widget on screen */
@ -123,9 +120,6 @@ bool Gui_Contains(int recX, int recY, int width, int height, int x, int y);
/* Gets the screen that the user is currently interacting with. */ /* Gets the screen that the user is currently interacting with. */
/* This means if an overlay is active, it will be over the top of other screens. */ /* This means if an overlay is active, it will be over the top of other screens. */
struct Screen* Gui_GetActiveScreen(void); struct Screen* Gui_GetActiveScreen(void);
/* Gets the non-overlay screen that the user is currently interacting with. */
/* This means if an overlay is active, the screen under it is returned. */
struct Screen* Gui_GetUnderlyingScreen(void);
/* Frees the active screen if it is not NULL. */ /* Frees the active screen if it is not NULL. */
/* NOTE: You should usually use Gui_CloseActive instead. */ /* NOTE: You should usually use Gui_CloseActive instead. */
@ -133,10 +127,6 @@ CC_NOINLINE void Gui_FreeActive(void);
/* Sets the active screen/menu that the user interacts with. */ /* Sets the active screen/menu that the user interacts with. */
/* NOTE: This doesn't free old active screen - must call Gui_FreeActive() first */ /* NOTE: This doesn't free old active screen - must call Gui_FreeActive() first */
CC_NOINLINE void Gui_SetActive(struct Screen* screen); CC_NOINLINE void Gui_SetActive(struct Screen* screen);
/* Shortcut for Gui_Close(Gui_Active) */
CC_NOINLINE void Gui_CloseActive(void);
/* Frees the given screen, and if == Gui_Active, calls Gui_SetActive(NULL) */
CC_NOINLINE void Gui_Close(void* screen);
/* Returns index of the given screen in the screens list, -1 if not */ /* Returns index of the given screen in the screens list, -1 if not */
int Gui_Index(struct Screen* screen); int Gui_Index(struct Screen* screen);
@ -159,10 +149,6 @@ void Gui_RefreshAll(void);
void Gui_RefreshHud(void); void Gui_RefreshHud(void);
void Gui_Refresh(struct Screen* s); void Gui_Refresh(struct Screen* s);
/* Returns index of the given screen in the overlays list, -1 if not */
int Gui_IndexOverlay(const void* screen);
/* Removes given screen from the overlays list */
void Gui_RemoveOverlay(const void* screen);
void Gui_RenderGui(double delta); void Gui_RenderGui(double delta);
void Gui_OnResize(void); void Gui_OnResize(void);

1
src/InputHandler.c
View File

@ -172,7 +172,6 @@ static bool InputHandler_HandleNonClassicKey(Key key) {
Event_RaiseVoid(&UserEvents.HeldBlockChanged); Event_RaiseVoid(&UserEvents.HeldBlockChanged);
} }
} else if (key == KeyBinds[KEYBIND_IDOVERLAY]) { } else if (key == KeyBinds[KEYBIND_IDOVERLAY]) {
if (Gui_OverlaysCount) return true;
TexIdsOverlay_Show(); TexIdsOverlay_Show();
} else if (key == KeyBinds[KEYBIND_BREAK_LIQUIDS]) { } else if (key == KeyBinds[KEYBIND_BREAK_LIQUIDS]) {
InputHandler_Toggle(key, &Game_BreakableLiquids, InputHandler_Toggle(key, &Game_BreakableLiquids,

128
src/Menus.c
View File

@ -223,11 +223,10 @@ static void Menu_HandleFontChange(struct Screen* s) {
static int Menu_Int(const String* str) { int v; Convert_ParseInt(str, &v); return v; } static int Menu_Int(const String* str) { int v; Convert_ParseInt(str, &v); return v; }
static float Menu_Float(const String* str) { float v; Convert_ParseFloat(str, &v); return v; } static float Menu_Float(const String* str) { float v; Convert_ParseFloat(str, &v); return v; }
static PackedCol Menu_HexCol(const String* str) { PackedCol v; PackedCol_TryParseHex(str, &v); return v; } static PackedCol Menu_HexCol(const String* str) { PackedCol v; PackedCol_TryParseHex(str, &v); return v; }
#define Menu_ReplaceActive(screen) Gui_FreeActive(); Gui_SetActive(screen);
static void Menu_SwitchOptions(void* a, void* b) { OptionsGroupScreen_Show(); } static void Menu_SwitchOptions(void* a, void* b) { OptionsGroupScreen_Show(); }
static void Menu_SwitchPause(void* a, void* b) { PauseScreen_Show(); } static void Menu_SwitchPause(void* a, void* b) { PauseScreen_Show(); }
static void Menu_SwitchClassicOptions(void* a, void* b) { Menu_ReplaceActive(ClassicOptionsScreen_MakeInstance()); } static void Menu_SwitchClassicOptions(void* a, void* b) { ClassicOptionsScreen_Show(); }
static void Menu_SwitchKeysClassic(void* a, void* b) { ClassicKeyBindingsScreen_Show(); } static void Menu_SwitchKeysClassic(void* a, void* b) { ClassicKeyBindingsScreen_Show(); }
static void Menu_SwitchKeysClassicHacks(void* a, void* b) { ClassicHacksKeyBindingsScreen_Show(); } static void Menu_SwitchKeysClassicHacks(void* a, void* b) { ClassicHacksKeyBindingsScreen_Show(); }
@ -236,12 +235,12 @@ static void Menu_SwitchKeysHacks(void* a, void* b) { HacksKeyBindingsScre
static void Menu_SwitchKeysOther(void* a, void* b) { OtherKeyBindingsScreen_Show(); } static void Menu_SwitchKeysOther(void* a, void* b) { OtherKeyBindingsScreen_Show(); }
static void Menu_SwitchKeysMouse(void* a, void* b) { MouseKeyBindingsScreen_Show(); } static void Menu_SwitchKeysMouse(void* a, void* b) { MouseKeyBindingsScreen_Show(); }
static void Menu_SwitchMisc(void* a, void* b) { Menu_ReplaceActive(MiscOptionsScreen_MakeInstance()); } static void Menu_SwitchMisc(void* a, void* b) { MiscOptionsScreen_Show(); }
static void Menu_SwitchGui(void* a, void* b) { Menu_ReplaceActive(GuiOptionsScreen_MakeInstance()); } static void Menu_SwitchGui(void* a, void* b) { GuiOptionsScreen_Show(); }
static void Menu_SwitchGfx(void* a, void* b) { Menu_ReplaceActive(GraphicsOptionsScreen_MakeInstance()); } static void Menu_SwitchGfx(void* a, void* b) { GraphicsOptionsScreen_Show(); }
static void Menu_SwitchHacks(void* a, void* b) { Menu_ReplaceActive(HacksSettingsScreen_MakeInstance()); } static void Menu_SwitchHacks(void* a, void* b) { HacksSettingsScreen_Show(); }
static void Menu_SwitchEnv(void* a, void* b) { Menu_ReplaceActive(EnvSettingsScreen_MakeInstance()); } static void Menu_SwitchEnv(void* a, void* b) { EnvSettingsScreen_Show(); }
static void Menu_SwitchNostalgia(void* a, void* b) { Menu_ReplaceActive(NostalgiaScreen_MakeInstance()); } static void Menu_SwitchNostalgia(void* a, void* b) { NostalgiaScreen_Show(); }
static void Menu_SwitchGenLevel(void* a, void* b) { GenLevelScreen_Show(); } static void Menu_SwitchGenLevel(void* a, void* b) { GenLevelScreen_Show(); }
static void Menu_SwitchClassicGenLevel(void* a, void* b) { ClassicGenScreen_Show(); } static void Menu_SwitchClassicGenLevel(void* a, void* b) { ClassicGenScreen_Show(); }
@ -502,6 +501,7 @@ static void MenuScreen_Free(void* screen) {
*#########################################################################################################################*/ *#########################################################################################################################*/
static struct PauseScreen { static struct PauseScreen {
MenuScreen_Layout MenuScreen_Layout
const struct SimpleButtonDesc* descs;
struct ButtonWidget buttons[6], quit, back; struct ButtonWidget buttons[6], quit, back;
} PauseScreen_Instance; } PauseScreen_Instance;
@ -514,18 +514,27 @@ static void PauseScreen_CheckHacksAllowed(void* screen) {
s->buttons[4].disabled = !LocalPlayer_Instance.Hacks.CanAnyHacks; /* select texture pack */ s->buttons[4].disabled = !LocalPlayer_Instance.Hacks.CanAnyHacks; /* select texture pack */
} }
static void PauseScreen_MakeButtons(struct PauseScreen* s, int width, const struct SimpleButtonDesc* descs, int count) { static void PauseScreen_ContextRecreated(void* screen) {
struct PauseScreen* s = (struct PauseScreen*)screen;
int i; int i;
for (i = 0; i < count; i++) { for (i = 0; i < s->numWidgets - 2; i++) {
String text = String_FromReadonly(descs[i].title); ButtonWidget_SetConst(&s->buttons[i], s->descs[i].title, &s->titleFont);
Menu_OldButton(s, i, &s->buttons[i], width, &text, &s->titleFont, descs[i].onClick,
ANCHOR_CENTRE, ANCHOR_CENTRE, descs[i].x, descs[i].y);
} }
if (!Gui_ClassicMenu) ButtonWidget_SetConst(&s->quit, "Quit game", &s->titleFont);
ButtonWidget_SetConst(&s->back, "Back to game", &s->titleFont);
if (!Server.IsSinglePlayer) {
s->buttons[1].disabled = true;
s->buttons[2].disabled = true;
}
PauseScreen_CheckHacksAllowed(s);
} }
static void PauseScreen_ContextRecreated(void* screen) { static void PauseScreen_Init(void* screen) {
static const String quitMsg = String_FromConst("Quit game"); static struct Widget* widgets[8];
struct PauseScreen* s = (struct PauseScreen*)screen; struct PauseScreen* s = (struct PauseScreen*)screen;
int i, count, width;
static const struct SimpleButtonDesc classicDescs[5] = { static const struct SimpleButtonDesc classicDescs[5] = {
{ 0, -100, "Options...", Menu_SwitchClassicOptions }, { 0, -100, "Options...", Menu_SwitchClassicOptions },
@ -543,32 +552,30 @@ static void PauseScreen_ContextRecreated(void* screen) {
{ -160, 50, "Hotkeys...", Menu_SwitchHotkeys } { -160, 50, "Hotkeys...", Menu_SwitchHotkeys }
}; };
if (Gui_ClassicMenu) { s->widgets = widgets;
PauseScreen_MakeButtons(s, 400, classicDescs, 5);
Menu_OldBack(s, 5, &s->back, "Back to game", &s->titleFont, PauseScreen_Game);
/* Disable nostalgia options in classic mode */
if (Game_ClassicMode) Menu_Remove(s, 4);
s->widgets[6] = NULL;
s->widgets[7] = NULL;
} else {
PauseScreen_MakeButtons(s, 300, modernDescs, 6);
Menu_OldButton(s, 6, &s->quit, 120, &quitMsg, &s->titleFont, PauseScreen_Quit,
ANCHOR_MAX, ANCHOR_MAX, 5, 5);
Menu_OldBack(s, 7, &s->back, "Back to game",&s->titleFont, PauseScreen_Game);
}
if (!Server.IsSinglePlayer) {
s->buttons[1].disabled = true;
s->buttons[2].disabled = true;
}
PauseScreen_CheckHacksAllowed(s);
}
static void PauseScreen_Init(void* screen) {
struct PauseScreen* s = (struct PauseScreen*)screen;
MenuScreen_Init(s); MenuScreen_Init(s);
Event_RegisterVoid(&UserEvents.HackPermissionsChanged, s, PauseScreen_CheckHacksAllowed); Event_RegisterVoid(&UserEvents.HackPermissionsChanged, s, PauseScreen_CheckHacksAllowed);
if (Gui_ClassicMenu) {
s->descs = classicDescs; /*400*/
/* Don't show nostalgia options in classic mode */
count = Game_ClassicMode ? 4 : 5;
} else {
s->descs = modernDescs; /*300*/
count = 6;
}
s->numWidgets = count + 2;
width = Gui_ClassicMenu ? 400 : 300;
for (i = 0; i < count; i++) {
Menu_Button(s, i, &s->buttons[i], width, s->descs[i].onClick,
ANCHOR_CENTRE, ANCHOR_CENTRE, s->descs[i].x, s->descs[i].y);
}
Menu_Button(s, count, &s->quit, 120, PauseScreen_Quit,
ANCHOR_MAX, ANCHOR_MAX, 5, 5);
Menu_Back(s, count + 1, &s->back, PauseScreen_Game);
} }
static void PauseScreen_Free(void* screen) { static void PauseScreen_Free(void* screen) {
@ -584,15 +591,10 @@ static struct ScreenVTABLE PauseScreen_VTABLE = {
Menu_OnResize, Menu_ContextLost, PauseScreen_ContextRecreated Menu_OnResize, Menu_ContextLost, PauseScreen_ContextRecreated
}; };
void PauseScreen_Show(void) { void PauseScreen_Show(void) {
static struct Widget* widgets[8];
struct PauseScreen* s = &PauseScreen_Instance; struct PauseScreen* s = &PauseScreen_Instance;
s->grabsInput = true; s->grabsInput = true;
s->closable = true; s->closable = true;
s->widgets = widgets; s->VTABLE = &PauseScreen_VTABLE;
s->numWidgets = Array_Elems(widgets);
s->VTABLE = &PauseScreen_VTABLE;
Gui_Replace((struct Screen*)s, GUI_PRIORITY_MENU); Gui_Replace((struct Screen*)s, GUI_PRIORITY_MENU);
} }
@ -2175,13 +2177,14 @@ static void ClassicOptionsScreen_ContextRecreated(void* screen) {
if (!Game_ClassicHacks) Menu_Remove(s, 8); if (!Game_ClassicHacks) Menu_Remove(s, 8);
} }
struct Screen* ClassicOptionsScreen_MakeInstance(void) { void ClassicOptionsScreen_Show(void) {
static struct MenuInputDesc descs[11]; static struct MenuInputDesc descs[11];
MenuInput_Enum(descs[2], ViewDist_Names, VIEW_COUNT); MenuInput_Enum(descs[2], ViewDist_Names, VIEW_COUNT);
MenuInput_Enum(descs[7], FpsLimit_Names, FPS_LIMIT_COUNT); MenuInput_Enum(descs[7], FpsLimit_Names, FPS_LIMIT_COUNT);
return MenuOptionsScreen_MakeInstance(11, struct Screen* s = MenuOptionsScreen_MakeInstance(11,
ClassicOptionsScreen_ContextRecreated, descs, NULL, 0); ClassicOptionsScreen_ContextRecreated, descs, NULL, 0);
Gui_Replace(s, GUI_PRIORITY_MENU);
} }
@ -2260,8 +2263,8 @@ static String String_InitAndClear(STRING_REF char* buffer, int capacity) {
return str; return str;
} }
struct Screen* EnvSettingsScreen_MakeInstance(void) { void EnvSettingsScreen_Show(void) {
static struct MenuInputDesc descs[1]; static struct MenuInputDesc descs[11];
MenuInput_Hex(descs[0], Env_DefaultCloudsCol); MenuInput_Hex(descs[0], Env_DefaultCloudsCol);
MenuInput_Hex(descs[1], Env_DefaultSkyCol); MenuInput_Hex(descs[1], Env_DefaultSkyCol);
MenuInput_Hex(descs[2], Env_DefaultFogCol); MenuInput_Hex(descs[2], Env_DefaultFogCol);
@ -2274,8 +2277,9 @@ struct Screen* EnvSettingsScreen_MakeInstance(void) {
MenuInput_Float(descs[8], -100, 100, 1); MenuInput_Float(descs[8], -100, 100, 1);
MenuInput_Int(descs[9], -2048, 2048, World.Height / 2); MenuInput_Int(descs[9], -2048, 2048, World.Height / 2);
return MenuOptionsScreen_MakeInstance(4, struct Screen* s = MenuOptionsScreen_MakeInstance(14,
EnvSettingsScreen_ContextRecreated, descs, NULL, 0); EnvSettingsScreen_ContextRecreated, descs, NULL, 0);
Gui_Replace(s, GUI_PRIORITY_MENU);
} }
@ -2334,7 +2338,7 @@ static void GraphicsOptionsScreen_ContextRecreated(void* screen) {
widgets[7] = NULL; widgets[8] = NULL; widgets[9] = NULL; widgets[7] = NULL; widgets[8] = NULL; widgets[9] = NULL;
} }
struct Screen* GraphicsOptionsScreen_MakeInstance(void) { void GraphicsOptionsScreen_Show(void) {
static struct MenuInputDesc descs[7]; static struct MenuInputDesc descs[7];
static const char* extDescs[Array_Elems(descs)]; static const char* extDescs[Array_Elems(descs)];
@ -2361,8 +2365,9 @@ struct Screen* GraphicsOptionsScreen_MakeInstance(void) {
MenuInput_Enum(descs[3], NameMode_Names, NAME_MODE_COUNT); MenuInput_Enum(descs[3], NameMode_Names, NAME_MODE_COUNT);
MenuInput_Enum(descs[4], ShadowMode_Names, SHADOW_MODE_COUNT); MenuInput_Enum(descs[4], ShadowMode_Names, SHADOW_MODE_COUNT);
return MenuOptionsScreen_MakeInstance(10, struct Screen* s = MenuOptionsScreen_MakeInstance(10,
GraphicsOptionsScreen_ContextRecreated, descs, extDescs, Array_Elems(extDescs)); GraphicsOptionsScreen_ContextRecreated, descs, extDescs, Array_Elems(extDescs));
Gui_Replace(s, GUI_PRIORITY_MENU);
} }
@ -2444,15 +2449,16 @@ static void GuiOptionsScreen_ContextRecreated(void* screen) {
widgets[11] = NULL; widgets[12] = NULL; widgets[13] = NULL; widgets[11] = NULL; widgets[12] = NULL; widgets[13] = NULL;
} }
struct Screen* GuiOptionsScreen_MakeInstance(void) { void GuiOptionsScreen_Show(void) {
static struct MenuInputDesc descs[11]; static struct MenuInputDesc descs[11];
MenuInput_Float(descs[2], 0.25f, 4.00f, 1); MenuInput_Float(descs[2], 0.25f, 4.00f, 1);
MenuInput_Float(descs[3], 0.25f, 4.00f, 1); MenuInput_Float(descs[3], 0.25f, 4.00f, 1);
MenuInput_Float(descs[6], 0.25f, 4.00f, 1); MenuInput_Float(descs[6], 0.25f, 4.00f, 1);
MenuInput_Int(descs[7], 0, 30, 10); MenuInput_Int(descs[7], 0, 30, 10);
return MenuOptionsScreen_MakeInstance(14, struct Screen* s = MenuOptionsScreen_MakeInstance(14,
GuiOptionsScreen_ContextRecreated, descs, NULL, 0); GuiOptionsScreen_ContextRecreated, descs, NULL, 0);
Gui_Replace(s, GUI_PRIORITY_MENU);
} }
@ -2585,7 +2591,7 @@ static void HacksSettingsScreen_ContextRecreated(void* screen) {
HacksSettingsScreen_CheckHacksAllowed(screen); HacksSettingsScreen_CheckHacksAllowed(screen);
} }
struct Screen* HacksSettingsScreen_MakeInstance(void) { void HacksSettingsScreen_Show(void) {
static struct MenuInputDesc descs[11]; static struct MenuInputDesc descs[11];
static const char* extDescs[Array_Elems(descs)]; static const char* extDescs[Array_Elems(descs)];
@ -2604,7 +2610,7 @@ struct Screen* HacksSettingsScreen_MakeInstance(void) {
struct Screen* s = MenuOptionsScreen_MakeInstance(14, struct Screen* s = MenuOptionsScreen_MakeInstance(14,
HacksSettingsScreen_ContextRecreated, descs, extDescs, Array_Elems(extDescs)); HacksSettingsScreen_ContextRecreated, descs, extDescs, Array_Elems(extDescs));
s->VTABLE->ContextLost = HacksSettingsScreen_ContextLost; s->VTABLE->ContextLost = HacksSettingsScreen_ContextLost;
return s; Gui_Replace(s, GUI_PRIORITY_MENU);
} }
@ -2678,7 +2684,7 @@ static void MiscOptionsScreen_ContextRecreated(void* screen) {
if (!Server.IsSinglePlayer) Menu_Remove(s, 4); if (!Server.IsSinglePlayer) Menu_Remove(s, 4);
} }
struct Screen* MiscOptionsScreen_MakeInstance(void) { void MiscOptionsScreen_Show(void) {
static struct MenuInputDesc descs[9]; static struct MenuInputDesc descs[9];
MenuInput_Float(descs[0], 1, 1024, 5); MenuInput_Float(descs[0], 1, 1024, 5);
MenuInput_Int(descs[1], 0, 100, 0); MenuInput_Int(descs[1], 0, 100, 0);
@ -2689,8 +2695,9 @@ struct Screen* MiscOptionsScreen_MakeInstance(void) {
MenuInput_Int(descs[7], 1, 200, 30); MenuInput_Int(descs[7], 1, 200, 30);
#endif #endif
return MenuOptionsScreen_MakeInstance(12, struct Screen* s = MenuOptionsScreen_MakeInstance(12,
MiscOptionsScreen_ContextRecreated, descs, NULL, 0); MiscOptionsScreen_ContextRecreated, descs, NULL, 0);
Gui_Replace(s, GUI_PRIORITY_MENU);
} }
@ -2758,9 +2765,10 @@ static void NostalgiaScreen_ContextRecreated(void* screen) {
ANCHOR_CENTRE, ANCHOR_CENTRE, 0, 100); ANCHOR_CENTRE, ANCHOR_CENTRE, 0, 100);
} }
struct Screen* NostalgiaScreen_MakeInstance(void) { void NostalgiaScreen_Show(void) {
return MenuOptionsScreen_MakeInstance(10, struct Screen* s = MenuOptionsScreen_MakeInstance(10,
NostalgiaScreen_ContextRecreated, NULL, NULL, 0); NostalgiaScreen_ContextRecreated, NULL, NULL, 0);
Gui_Replace(s, GUI_PRIORITY_MENU);
} }

14
src/Menus.h
View File

@ -9,7 +9,7 @@ struct Screen;
void PauseScreen_Show(void); void PauseScreen_Show(void);
void OptionsGroupScreen_Show(void); void OptionsGroupScreen_Show(void);
struct Screen* ClassicOptionsScreen_MakeInstance(void); void ClassicOptionsScreen_Show(void);
void ClassicKeyBindingsScreen_Show(void); void ClassicKeyBindingsScreen_Show(void);
void ClassicHacksKeyBindingsScreen_Show(void); void ClassicHacksKeyBindingsScreen_Show(void);
@ -26,12 +26,12 @@ void TexturePackScreen_Show(void);
void FontListScreen_Show(void); void FontListScreen_Show(void);
void HotkeyListScreen_Show(void); void HotkeyListScreen_Show(void);
struct Screen* MiscOptionsScreen_MakeInstance(void); void MiscOptionsScreen_Show(void);
struct Screen* GuiOptionsScreen_MakeInstance(void); void GuiOptionsScreen_Show(void);
struct Screen* GraphicsOptionsScreen_MakeInstance(void); void GraphicsOptionsScreen_Show(void);
struct Screen* HacksSettingsScreen_MakeInstance(void); void HacksSettingsScreen_Show(void);
struct Screen* EnvSettingsScreen_MakeInstance(void); void EnvSettingsScreen_Show(void);
struct Screen* NostalgiaScreen_MakeInstance(void); void NostalgiaScreen_Show(void);
void UrlWarningOverlay_Show(const String* url); void UrlWarningOverlay_Show(const String* url);
void TexIdsOverlay_Show(void); void TexIdsOverlay_Show(void);

4
src/Program.c
View File

@ -105,8 +105,8 @@ static int Program_Run(int argc, char** argv) {
int argsCount = Platform_GetCommandLineArgs(argc, argv, args); int argsCount = Platform_GetCommandLineArgs(argc, argv, args);
/* NOTE: Make sure to comment this out before pushing a commit */ /* NOTE: Make sure to comment this out before pushing a commit */
String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565"); //String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565");
//String rawArgs = String_FromConst("UnknownShadow200"); String rawArgs = String_FromConst("UnknownShadow200");
argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4); argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4);
if (argsCount == 0) { if (argsCount == 0) {