X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgui%2FcheatMenu.cpp;h=d441e8dfcecd8c1ba2da9f810e2d1946f8ea8b29;hb=75ecaa2173f327c1453bd36c2601b0833ecb905f;hp=5a7f5247721d8a15bf6a161d5be9623eeca976c7;hpb=fc8c8f01ca15912b1db176fec473bcfb0333032f;p=dragonfireclient.git diff --git a/src/gui/cheatMenu.cpp b/src/gui/cheatMenu.cpp index 5a7f52477..d441e8dfc 100644 --- a/src/gui/cheatMenu.cpp +++ b/src/gui/cheatMenu.cpp @@ -23,8 +23,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "cheatMenu.h" #include -FontMode CheatMenu::fontStringToEnum(std::string str) { - if (str == "FM_Standard") +FontMode CheatMenu::fontStringToEnum(std::string str) +{ + if (str == "FM_Standard") return FM_Standard; else if (str == "FM_Mono") return FM_Mono; @@ -45,32 +46,32 @@ 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; - - 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); - + v3f bg_color, active_bg_color, 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("cheat_menu_bg_color_alpha"), + bg_color.X, bg_color.Y, bg_color.Z); + + 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("cheat_menu_font_color_alpha"), + font_color.X, font_color.Y, font_color.Z); + + 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 dim = m_font->getDimension(L"M"); m_fontsize = v2u32(dim.Width, dim.Height); @@ -80,41 +81,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(x, y, x + width, y + height)); - if (is_selected) + if (selected) driver->draw2DRectangleOutline( - core::rect(x - 2, y - 2, x + width + 1, y + height + 1), + core::rect(x - 1, y - 1, x + width, y + height), *fontcolor); int fx = x + 5, fy = y + (height - m_fontsize.Y) / 2; core::rect fontbounds( @@ -124,26 +113,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++; } } @@ -154,120 +141,119 @@ void CheatMenu::draw(video::IVideoDriver *driver, bool show_debug) void CheatMenu::drawHUD(video::IVideoDriver *driver, double dtime) { CHEAT_MENU_GET_SCRIPTPTR - + m_rainbow_offset += dtime; m_rainbow_offset = fmod(m_rainbow_offset, 6.0f); - + std::vector enabled_cheats; - + int cheat_count = 0; - - for (auto category = script->m_cheat_categories.begin(); category != script->m_cheat_categories.end(); category++) { - for (auto cheat = (*category)->m_cheats.begin(); cheat != (*category)->m_cheats.end(); cheat++) { + + for (auto category = script->m_cheat_categories.begin(); + category != script->m_cheat_categories.end(); category++) { + for (auto cheat = (*category)->m_cheats.begin(); + cheat != (*category)->m_cheats.end(); cheat++) { if ((*cheat)->is_enabled()) { enabled_cheats.push_back((*cheat)->m_name); cheat_count++; } } } - + if (enabled_cheats.empty()) return; - + std::vector colors; - + for (int i = 0; i < cheat_count; i++) { video::SColor color; f32 h = (f32)i * 2.0f / (f32)cheat_count - m_rainbow_offset; if (h < 0) h = 6.0f + h; f32 x = (1 - fabs(fmod(h, 2.0f) - 1.0f)) * 255.0f; - switch((int)h) { + switch ((int)h) { case 0: - color = video::SColor(255, 255, x, 0); break; + color = video::SColor(255, 255, x, 0); + break; case 1: - color = video::SColor(255, x, 255, 0); break; + color = video::SColor(255, x, 255, 0); + break; case 2: - color = video::SColor(255, 0, 255, x); break; + color = video::SColor(255, 0, 255, x); + break; case 3: - color = video::SColor(255, 0, x, 255); break; + color = video::SColor(255, 0, x, 255); + break; case 4: - color = video::SColor(255, x, 0, 255); break; + color = video::SColor(255, x, 0, 255); + break; case 5: - color = video::SColor(255, 255, 0, x); break; + color = video::SColor(255, 255, 0, x); + break; } colors.push_back(color); } - + core::dimension2d screensize = driver->getScreenSize(); - + u32 y = 5; - + int i = 0; for (std::string cheat : enabled_cheats) { - core::dimension2d dim = m_font->getDimension(utf8_to_wide(cheat).c_str()); + core::dimension2d dim = + m_font->getDimension(utf8_to_wide(cheat).c_str()); u32 x = screensize.Width - 5 - dim.Width; - + core::rect fontbounds(x, y, x + dim.Width, y + dim.Height); m_font->draw(cheat.c_str(), fontbounds, colors[i], false, false); - + y += dim.Height; i++; } } -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()