]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/gui/cheatMenu.cpp
Merge branch 'master' into master
[dragonfireclient.git] / src / gui / cheatMenu.cpp
index 1485541c255e375b542ec8d04fd3b0b4149ee6e0..5a7f5247721d8a15bf6a161d5be9623eeca976c7 100644 (file)
@@ -17,14 +17,57 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "cheatMenu.h"
 #include "script/scripting_client.h"
 #include "client/client.h"
 #include "client/fontengine.h"
+#include "cheatMenu.h"
+#include <cstddef>
+
+FontMode CheatMenu::fontStringToEnum(std::string str) {
+       if (str == "FM_Standard") 
+               return FM_Standard;
+       else if (str == "FM_Mono")
+               return FM_Mono;
+       else if (str == "FM_Fallback")
+               return FM_Fallback;
+       else if (str == "FM_Simple")
+               return FM_Simple;
+       else if (str == "FM_SimpleMono")
+               return FM_SimpleMono;
+       else if (str == "FM_MaxMode")
+               return FM_MaxMode;
+       else if (str == "FM_Unspecified")
+               return FM_Unspecified;
+       else
+               return FM_Standard;
+}
 
 CheatMenu::CheatMenu(Client *client) : m_client(client)
 {
-       m_font = g_fontengine->getFont(FONT_SIZE_UNSPECIFIED, FM_Fallback);
+       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;
+
+       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);
+
+       m_bg_color = video::SColor(g_settings->getU32("m_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"), 
+                                                                 active_bg_color.X, active_bg_color.Y, active_bg_color.Z);
+
+       m_font_color = video::SColor(g_settings->getU32("m_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"),
+                                                                                 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;
@@ -37,29 +80,41 @@ CheatMenu::CheatMenu(Client *client) : m_client(client)
        m_fontsize.Y = MYMAX(m_fontsize.Y, 1);
 }
 
-void CheatMenu::drawEntry(video::IVideoDriver *driver, std::string name, int number,
-               bool selected, bool active, CheatMenuEntryType entry_type)
+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)
 {
        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;
-       if (entry_type == CHEAT_MENU_ENTRY_TYPE_HEAD) {
+
+       // 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)
                bgcolor = &m_active_bg_color;
+
+       switch (entry_type)
+       {
+       case CHEAT_MENU_ENTRY_TYPE_HEAD:
                height = m_head_height;
-       } 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;
+               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;
        }
+
        driver->draw2DRectangle(*bgcolor, core::rect<s32>(x, y, x + width, y + height));
-       if (selected)
+       if (is_selected)
                driver->draw2DRectangleOutline(
-                               core::rect<s32>(x - 1, y - 1, x + width, y + height),
+                               core::rect<s32>(x - 2, y - 2, x + width + 1, y + height + 1),
                                *fontcolor);
        int fx = x + 5, fy = y + (height - m_fontsize.Y) / 2;
        core::rect<s32> fontbounds(
@@ -69,24 +124,26 @@ void CheatMenu::drawEntry(video::IVideoDriver *driver, std::string name, int num
 
 void CheatMenu::draw(video::IVideoDriver *driver, bool show_debug)
 {
-       CHEAT_MENU_GET_SCRIPTPTR
+       ClientScripting *script{ getScript() };
+       if (!script || !script->m_cheats_loaded)
+        return;
 
+       // Draw menu header if debug info is not being drawn.
        if (!show_debug)
-               drawEntry(driver, "Dragonfireclient", 0, false, false,
-                               CHEAT_MENU_ENTRY_TYPE_HEAD);
+               drawEntry(driver, "Dragonfireclient", 0, 0, false, false,
+                       CHEAT_MENU_ENTRY_TYPE_HEAD);
+
        int category_count = 0;
-       for (auto category = script->m_cheat_categories.begin();
-                       category != script->m_cheat_categories.end(); category++) {
+       for (const auto &menu_item : script->m_cheat_categories) {
                bool is_selected = category_count == m_selected_category;
-               drawEntry(driver, (*category)->m_name, category_count, is_selected, false,
-                               CHEAT_MENU_ENTRY_TYPE_CATEGORY);
+               drawEntry(driver, menu_item->m_name, category_count, 0, is_selected,
+                       false, CHEAT_MENU_ENTRY_TYPE_CATEGORY);
                if (is_selected && m_cheat_layer) {
                        int cheat_count = 0;
-                       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());
+                       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());
                                cheat_count++;
                        }
                }
@@ -160,47 +217,57 @@ void CheatMenu::drawHUD(video::IVideoDriver *driver, double dtime)
        }
 }
 
-void CheatMenu::selectUp()
+void CheatMenu::selectLeft()
 {
        CHEAT_MENU_GET_SCRIPTPTR
 
-       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;
+       int max = script->m_cheat_categories.size() - 1;
+       int *selected = &m_selected_category;
        --*selected;
        if (*selected < 0)
                *selected = max;
 }
 
-void CheatMenu::selectDown()
+void CheatMenu::selectRight()
 {
        CHEAT_MENU_GET_SCRIPTPTR
 
-       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;
+       int max = script->m_cheat_categories.size() - 1;
+       int *selected = &m_selected_category;
        ++*selected;
        if (*selected > max)
                *selected = 0;
 }
 
-void CheatMenu::selectRight()
+void CheatMenu::selectDown()
 {
-       if (m_cheat_layer)
-               return;
+       CHEAT_MENU_GET_SCRIPTPTR
+
        m_cheat_layer = true;
-       m_selected_cheat = 0;
+
+       int max = script->m_cheat_categories[m_selected_category]->m_cheats.size();
+       int *selected = &m_selected_cheat;
+       ++*selected;
+       if (*selected > max) {
+               *selected = 1;
+       }
 }
 
-void CheatMenu::selectLeft()
+void CheatMenu::selectUp()
 {
-       if (!m_cheat_layer)
+       if (!m_cheat_layer) {
                return;
-       m_cheat_layer = false;
+       }
+
+       CHEAT_MENU_GET_SCRIPTPTR
+
+       int *selected = &m_selected_cheat;
+       --*selected;
+
+       if (*selected < 0) {
+               m_cheat_layer = false;
+               *selected = 1;
+       }
 }
 
 void CheatMenu::selectConfirm()