Cheat Menu Improvements Change

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 620e4b3559f9a4452444d00d99f8f4d52e8ad2ec..74fb5dc92bda86fc4c26461a9e580388b18a35ab 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2216,27 +2216,27 @@ contentdb_flag_blacklist (ContentDB Flag Blacklist) string nonfree, desktop_defa
 [Cheat Menu]
 
 #   Font to use for cheat menu
-cheat_menu_font (MenuFont) enum FM_Standard, FM_Mono, FM_Fallback, FM_Simple, FM_SimpleMono, FM_MaxMode, FM_Unspecified
+cheat_menu_font (MenuFont) enum FM_Mono FM_Standard,FM_Mono,FM_Fallback,FM_Simple,FM_SimpleMono,FM_MaxMode,FM_Unspecified
 
 #   (RGB value)
-m_bg_color (Cell background color) v3f 45 45 68
+cheat_menu_bg_color (Cell background color) v3f 255, 145, 88
 
-m_bg_color_alpha (Cell background color alpha) int 173
+cheat_menu_bg_color_alpha (Cell background color alpha) int 192
 
 #   (RGB value)
-m_active_bg_color (Active cell background color) v3f 0 0 0
+cheat_menu_active_bg_color (Active cell background color) v3f 255, 87, 53
 
-m_active_bg_color_alpha (Active cell background color alpha) int 210
+cheat_menu_active_bg_color_alpha (Active cell background color alpha) int 192
 
 #   (RGB value)
-m_font_color (Font color) v3f 255 255 255
+cheat_menu_font_color (Font color) v3f 0, 0, 0
 
-m_font_color_alpha (Font color alpha) int 195 
+cheat_menu_font_color_alpha (Font color alpha) int 255 
 
 #   (RGB value)
-m_selected_font_color (Selected font color) v3f 255 255 255
+cheat_menu_selected_font_color (Selected font color) v3f 255, 252, 88
 
-m_selected_font_color_alpha (Selected font color alpha) int 235
+cheat_menu_selected_font_color_alpha (Selected font color alpha) int 255
 
 [Cheats]
 
@@ -2344,4 +2344,4 @@ forcefield (Forcefield) bool false
 
 friendlist (Killaura / Forcefield Friendlist) string
 
-cheat_hud (CheatHUD) bool true
\ No newline at end of file
+cheat_hud (CheatHUD) bool true

diff --git a/fonts/Arimo-Regular-old.ttf b/fonts/Arimo-Regular-old.ttf
deleted file mode 100644 (file)
index 9be443c..0000000
Binary files a/fonts/Arimo-Regular-old.ttf and /dev/null differ

diff --git a/fonts/Arimo-Regular.ttf b/fonts/Arimo-Regular.ttf
old mode 100755 (executable)
new mode 100644 (file)
index 778d3a0..9be443c
Binary files a/fonts/Arimo-Regular.ttf and b/fonts/Arimo-Regular.ttf differ

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 619c26eec8669c374b4f1691e2520ca4afc9f15d..347ab7e9c8529016d90ea1b67e34b579dbf1f8c2 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -65,11 +65,15 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_register_confirmation", "true");
 
        // Cheat Menu
-       settings->setDefault("cheat_menu_font", "FM_Mono");
-       settings->setDefault("m_bg_color_alpha", "173");
-       settings->setDefault("m_active_bg_color_alpha", "210");
-       settings->setDefault("m_font_color_alpha", "195");
-       settings->setDefault("m_selected_font_color_alpha", "235");
+       settings->setDefault("cheat_menu_font", "FM_Standard");
+       settings->setDefault("cheat_menu_bg_color", "(255, 145, 88)");
+       settings->setDefault("cheat_menu_bg_color_alpha", "192");
+       settings->setDefault("cheat_menu_active_bg_color", "(255, 87, 53)");
+       settings->setDefault("cheat_menu_active_bg_color_alpha", "192");
+       settings->setDefault("cheat_menu_font_color", "(0, 0, 0)");
+       settings->setDefault("cheat_menu_font_color_alpha", "255");
+       settings->setDefault("cheat_menu_selected_font_color", "(255, 252, 88)");
+       settings->setDefault("cheat_menu_selected_font_color_alpha", "255");
        
        // Cheats
        settings->setDefault("xray", "false");

diff --git a/src/gui/cheatMenu.cpp b/src/gui/cheatMenu.cpp
index 5a7f5247721d8a15bf6a161d5be9623eeca976c7..e66fbc250366b1c7062dcb513d14001b96f76e18 100644 (file)
--- a/src/gui/cheatMenu.cpp
+++ b/src/gui/cheatMenu.cpp
@@ -45,32 +45,29 @@ FontMode CheatMenu::fontStringToEnum(std::string str) {
 CheatMenu::CheatMenu(Client *client) : m_client(client)
 {
        FontMode fontMode = fontStringToEnum(g_settings->get("cheat_menu_font"));
-       irr::core::vector3df bg_color;
-       irr::core::vector3df active_bg_color;
-       irr::core::vector3df font_color;
-       irr::core::vector3df selected_font_color;
+       v3f bg_color, active_bg_color, font_color, selected_font_color;
 
-       g_settings->getV3FNoEx("m_bg_color", bg_color);
-       g_settings->getV3FNoEx("m_active_bg_color", active_bg_color);
-       g_settings->getV3FNoEx("m_font_color", font_color);
-       g_settings->getV3FNoEx("m_selected_font_color", selected_font_color);
+       bg_color = g_settings->getV3F("cheat_menu_bg_color");
+       active_bg_color = g_settings->getV3F("cheat_menu_active_bg_color");
+       font_color = g_settings->getV3F("cheat_menu_font_color");
+       selected_font_color = g_settings->getV3F("cheat_menu_selected_font_color");
 
-       m_bg_color = video::SColor(g_settings->getU32("m_bg_color_alpha"), 
+       m_bg_color = video::SColor(g_settings->getU32("cheat_menu_bg_color_alpha"), 
                                                           bg_color.X, bg_color.Y, bg_color.Z);
        
-       m_active_bg_color = video::SColor(g_settings->getU32("m_active_bg_color_alpha"), 
+       m_active_bg_color = video::SColor(g_settings->getU32("cheat_menu_active_bg_color_alpha"), 
                                                                  active_bg_color.X, active_bg_color.Y, active_bg_color.Z);
 
-       m_font_color = video::SColor(g_settings->getU32("m_font_color_alpha"),
+       m_font_color = video::SColor(g_settings->getU32("cheat_menu_font_color_alpha"),
                                                                 font_color.X, font_color.Y, font_color.Z);
 
-       m_selected_font_color = video::SColor(g_settings->getU32("m_selected_font_color_alpha"),
+       m_selected_font_color = video::SColor(g_settings->getU32("cheat_menu_selected_font_color_alpha"),
                                                                                  selected_font_color.X, selected_font_color.Y, selected_font_color.Z);
        
        m_font = g_fontengine->getFont(FONT_SIZE_UNSPECIFIED, fontMode);
 
        if (!m_font) {
-               errorstream << "CheatMenu: Unable to load fallback font" << std::endl;
+               errorstream << "CheatMenu: Unable to load font" << std::endl;
        } else {
                core::dimension2d<u32> dim = m_font->getDimension(L"M");
                m_fontsize = v2u32(dim.Width, dim.Height);
@@ -80,41 +77,29 @@ CheatMenu::CheatMenu(Client *client) : m_client(client)
        m_fontsize.Y = MYMAX(m_fontsize.Y, 1);
 }
 
-void CheatMenu::drawEntry(video::IVideoDriver *driver, std::string name,
-       std::size_t column_align_index, std::size_t cheat_entry_index,
-       bool is_selected, bool is_enabled, CheatMenuEntryType entry_type)
+void CheatMenu::drawEntry(video::IVideoDriver *driver, std::string name, int number,
+               bool selected, bool active, CheatMenuEntryType entry_type)
 {
        int x = m_gap, y = m_gap, width = m_entry_width, height = m_entry_height;
        video::SColor *bgcolor = &m_bg_color, *fontcolor = &m_font_color;
-
-       // Align with correct column.
-       x += m_gap + column_align_index * (m_entry_width + m_gap);
-
-       if (is_selected)
-               fontcolor = &m_selected_font_color;
-       if (is_enabled)
+       if (entry_type == CHEAT_MENU_ENTRY_TYPE_HEAD) {
                bgcolor = &m_active_bg_color;
-
-       switch (entry_type)
-       {
-       case CHEAT_MENU_ENTRY_TYPE_HEAD:
                height = m_head_height;
-               break;
-       case CHEAT_MENU_ENTRY_TYPE_CATEGORY:
-               y += m_head_height + m_gap;
-               break;
-       case CHEAT_MENU_ENTRY_TYPE_ENTRY:
-               y += m_head_height + (cheat_entry_index + 1) * (m_entry_height + m_gap);
-               break;
-       default:
-               // TODO log an error or something.
-               break;
+       } else {
+               bool is_category = entry_type == CHEAT_MENU_ENTRY_TYPE_CATEGORY;
+               y += m_gap + m_head_height +
+                    (number + (is_category ? 0 : m_selected_category)) *
+                                    (m_entry_height + m_gap);
+               x += (is_category ? 0 : m_gap + m_entry_width);
+               if (active)
+                       bgcolor = &m_active_bg_color;
+               if (selected)
+                       fontcolor = &m_selected_font_color;
        }
-
        driver->draw2DRectangle(*bgcolor, core::rect<s32>(x, y, x + width, y + height));
-       if (is_selected)
+       if (selected)
                driver->draw2DRectangleOutline(
-                               core::rect<s32>(x - 2, y - 2, x + width + 1, y + height + 1),
+                               core::rect<s32>(x - 1, y - 1, x + width, y + height),
                                *fontcolor);
        int fx = x + 5, fy = y + (height - m_fontsize.Y) / 2;
        core::rect<s32> fontbounds(
@@ -124,26 +109,24 @@ void CheatMenu::drawEntry(video::IVideoDriver *driver, std::string name,
 
 void CheatMenu::draw(video::IVideoDriver *driver, bool show_debug)
 {
-       ClientScripting *script{ getScript() };
-       if (!script || !script->m_cheats_loaded)
-        return;
+       CHEAT_MENU_GET_SCRIPTPTR
 
-       // Draw menu header if debug info is not being drawn.
        if (!show_debug)
-               drawEntry(driver, "Dragonfireclient", 0, 0, false, false,
-                       CHEAT_MENU_ENTRY_TYPE_HEAD);
-
+               drawEntry(driver, "Dragonfireclient", 0, false, false,
+                               CHEAT_MENU_ENTRY_TYPE_HEAD);
        int category_count = 0;
-       for (const auto &menu_item : script->m_cheat_categories) {
+       for (auto category = script->m_cheat_categories.begin();
+                       category != script->m_cheat_categories.end(); category++) {
                bool is_selected = category_count == m_selected_category;
-               drawEntry(driver, menu_item->m_name, category_count, 0, is_selected,
-                       false, CHEAT_MENU_ENTRY_TYPE_CATEGORY);
+               drawEntry(driver, (*category)->m_name, category_count, is_selected, false,
+                               CHEAT_MENU_ENTRY_TYPE_CATEGORY);
                if (is_selected && m_cheat_layer) {
                        int cheat_count = 0;
-                       for (const auto &sub_menu_item : menu_item->m_cheats) {
-                               drawEntry(driver, sub_menu_item->m_name, category_count,
-                                       cheat_count, cheat_count == m_selected_cheat,
-                                       sub_menu_item->is_enabled());
+                       for (auto cheat = (*category)->m_cheats.begin();
+                                       cheat != (*category)->m_cheats.end(); cheat++) {
+                               drawEntry(driver, (*cheat)->m_name, cheat_count,
+                                               cheat_count == m_selected_cheat,
+                                               (*cheat)->is_enabled());
                                cheat_count++;
                        }
                }
@@ -217,57 +200,47 @@ void CheatMenu::drawHUD(video::IVideoDriver *driver, double dtime)
        }
 }
 
-void CheatMenu::selectLeft()
+void CheatMenu::selectUp()
 {
        CHEAT_MENU_GET_SCRIPTPTR
 
-       int max = script->m_cheat_categories.size() - 1;
-       int *selected = &m_selected_category;
+       int max = (m_cheat_layer ? script->m_cheat_categories[m_selected_category]
+                                                                 ->m_cheats.size()
+                                : script->m_cheat_categories.size()) -
+                 1;
+       int *selected = m_cheat_layer ? &m_selected_cheat : &m_selected_category;
        --*selected;
        if (*selected < 0)
                *selected = max;
 }
 
-void CheatMenu::selectRight()
+void CheatMenu::selectDown()
 {
        CHEAT_MENU_GET_SCRIPTPTR
 
-       int max = script->m_cheat_categories.size() - 1;
-       int *selected = &m_selected_category;
+       int max = (m_cheat_layer ? script->m_cheat_categories[m_selected_category]
+                                                                 ->m_cheats.size()
+                                : script->m_cheat_categories.size()) -
+                 1;
+       int *selected = m_cheat_layer ? &m_selected_cheat : &m_selected_category;
        ++*selected;
        if (*selected > max)
                *selected = 0;
 }
 
-void CheatMenu::selectDown()
+void CheatMenu::selectRight()
 {
-       CHEAT_MENU_GET_SCRIPTPTR
-
+       if (m_cheat_layer)
+               return;
        m_cheat_layer = true;
-
-       int max = script->m_cheat_categories[m_selected_category]->m_cheats.size();
-       int *selected = &m_selected_cheat;
-       ++*selected;
-       if (*selected > max) {
-               *selected = 1;
-       }
+       m_selected_cheat = 0;
 }
 
-void CheatMenu::selectUp()
+void CheatMenu::selectLeft()
 {
-       if (!m_cheat_layer) {
+       if (!m_cheat_layer)
                return;
-       }
-
-       CHEAT_MENU_GET_SCRIPTPTR
-
-       int *selected = &m_selected_cheat;
-       --*selected;
-
-       if (*selected < 0) {
-               m_cheat_layer = false;
-               *selected = 1;
-       }
+       m_cheat_layer = false;
 }
 
 void CheatMenu::selectConfirm()

diff --git a/src/gui/cheatMenu.h b/src/gui/cheatMenu.h
index bedd7e048e71fa92093058f7837672f4238bc5e5..8be73c4831a3829ceb78ce575f5d0d1b547837fb 100644 (file)
--- a/src/gui/cheatMenu.h
+++ b/src/gui/cheatMenu.h
@@ -51,9 +51,8 @@ class CheatMenu
        
        void drawHUD(video::IVideoDriver *driver, double dtime);
 
-       void drawEntry(video::IVideoDriver *driver, std::string name,
-               std::size_t column_align_index, std::size_t cheat_entry_index,
-               bool is_selected, bool is_enabled,
+       void drawEntry(video::IVideoDriver *driver, std::string name, int number,
+               bool selected, bool active,
                CheatMenuEntryType entry_type = CHEAT_MENU_ENTRY_TYPE_ENTRY);
 
        void selectUp();
@@ -67,15 +66,15 @@ class CheatMenu
        int m_selected_cheat = 0;
        int m_selected_category = 0;
 
-       int m_head_height = 20;
-       int m_entry_height = 20;
-       int m_entry_width = 150;
+       int m_head_height = 50;
+       int m_entry_height = 40;
+       int m_entry_width = 200;
        int m_gap = 3;
 
-       video::SColor m_bg_color = video::SColor(173, 45, 45, 68);
-       video::SColor m_active_bg_color = video::SColor(210, 0, 0, 0);
-       video::SColor m_font_color = video::SColor(195, 255, 255, 255);
-       video::SColor m_selected_font_color = video::SColor(235, 255, 255, 255);
+       video::SColor m_bg_color = video::SColor(192, 255, 145, 88);
+       video::SColor m_active_bg_color = video::SColor(192, 255, 87, 53);
+       video::SColor m_font_color = video::SColor(255, 0, 0, 0);
+       video::SColor m_selected_font_color = video::SColor(255, 255, 252, 88);
 
        FontMode fontStringToEnum(std::string str);