mirror of
https://github.com/ClassiCube/ClassiCube.git
synced 2025-09-13 09:35:23 -04:00
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)
This commit is contained in:
parent
de88d5c0b4
commit
63f248f793
@ -78,7 +78,8 @@ void Gui_ShowDefault(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.TabAutocomplete = Options_GetBool(OPT_TAB_AUTOCOMPLETE, true) && !Game_ClassicMode;
|
||||
|
||||
|
@ -42,6 +42,7 @@ CC_VAR extern struct _GuiData {
|
||||
cc_bool ShowFPS;
|
||||
float RawHotbarScale, RawChatScale, RawInventoryScale;
|
||||
GfxResourceID GuiTex, GuiClassicTex, IconsTex, TouchTex;
|
||||
int DefaultLines;
|
||||
} Gui;
|
||||
|
||||
float Gui_Scale(float value);
|
||||
|
@ -2701,8 +2701,8 @@ static void ChatOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) {
|
||||
|
||||
void ChatOptionsScreen_Show(void) {
|
||||
static struct MenuInputDesc descs[5];
|
||||
MenuInput_Float(descs[0], 0.25f, 4.00f, 1);
|
||||
MenuInput_Int(descs[1], 0, 30, 10);
|
||||
MenuInput_Float(descs[0], 0.25f, 4.00f, 1);
|
||||
MenuInput_Int(descs[1], 0, 30, Gui.DefaultLines);
|
||||
MenuOptionsScreen_Show(descs, NULL, 0, ChatOptionsScreen_InitWidgets);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user