AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 10:05:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix while chatlines defaults to 12 when loading from options.txt, it was 10 in chat options menu - now it's consistently 10 in classic mode and 12 in normal (Thanks fizzwhiz)

Browse Source
This commit is contained in:
UnknownShadow200 2020-11-05 01:00:54 +11:00
parent de88d5c0b4
commit 63f248f793
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Gui.c
View File

@ -78,7 +78,8 @@ void Gui_ShowDefault(void) {
} }
static void Gui_LoadOptions(void) { static void Gui_LoadOptions(void) {
Gui.Chatlines = Options_GetInt(OPT_CHATLINES, 0, 30, 12); Gui.DefaultLines = Game_ClassicMode ? 10 : 12;
Gui.Chatlines = Options_GetInt(OPT_CHATLINES, 0, 30, Gui.DefaultLines);
Gui.ClickableChat = Options_GetBool(OPT_CLICKABLE_CHAT, true) && !Game_ClassicMode; Gui.ClickableChat = Options_GetBool(OPT_CLICKABLE_CHAT, true) && !Game_ClassicMode;
Gui.TabAutocomplete = Options_GetBool(OPT_TAB_AUTOCOMPLETE, true) && !Game_ClassicMode; Gui.TabAutocomplete = Options_GetBool(OPT_TAB_AUTOCOMPLETE, true) && !Game_ClassicMode;

1
src/Gui.h
View File

@ -42,6 +42,7 @@ CC_VAR extern struct _GuiData {
cc_bool ShowFPS; cc_bool ShowFPS;
float RawHotbarScale, RawChatScale, RawInventoryScale; float RawHotbarScale, RawChatScale, RawInventoryScale;
GfxResourceID GuiTex, GuiClassicTex, IconsTex, TouchTex; GfxResourceID GuiTex, GuiClassicTex, IconsTex, TouchTex;
int DefaultLines;
} Gui; } Gui;
float Gui_Scale(float value); float Gui_Scale(float value);

2
src/Menus.c
View File

@ -2702,7 +2702,7 @@ static void ChatOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) {
void ChatOptionsScreen_Show(void) { void ChatOptionsScreen_Show(void) {
static struct MenuInputDesc descs[5]; static struct MenuInputDesc descs[5];
MenuInput_Float(descs[0], 0.25f, 4.00f, 1); MenuInput_Float(descs[0], 0.25f, 4.00f, 1);
MenuInput_Int(descs[1], 0, 30, 10); MenuInput_Int(descs[1], 0, 30, Gui.DefaultLines);
MenuOptionsScreen_Show(descs, NULL, 0, ChatOptionsScreen_InitWidgets); MenuOptionsScreen_Show(descs, NULL, 0, ChatOptionsScreen_InitWidgets);
} }