Drop character credits

src/character.cpp

@@ -84,7 +84,6 @@ void Character::preview_load(const std::string& path, Renderer& renderer)
     id = json_string(root, "id", key);
     name = json_string(root, "name", key);
     description = json_string(root, "description");
-    credits = json_string(root, "credits");
     color = json_color(root, "color", color);
     traits.weight = json_float(root, "weight");
     auto texture_get = [&](const char* relative) {
@@ -147,7 +146,7 @@ static void interact_parse(object source, InteractArea& area, Character& charact
 static void character_parse(object root, Character& character, Renderer& renderer, Audio& audio)
 {
     json_keys_check(root,
-                    {"id", "name", "description", "credits", "color", "weight", "weightMax", "capacity", "capacityMax",
+                    {"id", "name", "description", "color", "weight", "weightMax", "capacity", "capacityMax",
                      "overstuffedMultiplier", "overstuffedDigestBonus", "caloriesToKilogram", "digestionRate",
                      "digestionRateMin", "digestionRateMax", "digestionTime", "blinkChance", "gurgleChance",
                      "gurgleCapacityMultiplier", "alternate", "stages", "animations", "talk", "blink", "eatAreas",

src/character.h

@@ -308,7 +308,6 @@ class Character
 {
 public:
     std::array<Sounds, SOUND_COUNT> sounds;
-    std::string credits;
     std::string description;
     std::string folder;
     std::string id;

src/ui.cpp

@@ -43,12 +43,12 @@ constexpr float TASKBAR_FIT = 0.8f;
 constexpr int BUTTONS_FIXED = 9;
 constexpr float INFO_GAP = 4;
 constexpr int COOLDOWN_SEGMENTS = 48;
-constexpr const char* PANEL_ICONS[] = {"", "stats", "catalog", "settings", "cheats", "credits"};
-constexpr const char* PANEL_NAMES[] = {"", "Stats", "Catalog", "Settings", "Cheats", "Credits"};
+constexpr const char* PANEL_ICONS[] = {"", "stats", "catalog", "settings", "cheats"};
+constexpr const char* PANEL_NAMES[] = {"", "Stats", "Catalog", "Settings", "Cheats"};
 constexpr float PREVIEW_FRACTION = 0.68f;
 constexpr float PREVIEW_WIDTH = 760;
 constexpr float SELECT_BUTTON_SIZE = 112;
-constexpr int SELECT_BUTTONS_FIXED = 2;
+constexpr int SELECT_BUTTONS_FIXED = 1;
 constexpr float KG_TO_G = 1000;
 constexpr float KG_TO_LB = 2.20462f;
 constexpr float LB_TO_OZ = 16;
@@ -1049,6 +1049,8 @@ void Ui::select_update(std::vector<Character>& characters, Settings& settings)
         {
             Character& entry = characters[i];
             ImGui::PushID(i);
+            if (i > 0)
+                ImGui::SameLine();
             style_push(entry.color);
             bool isCurrent = i == characterIndex;
             if (isCurrent)
@@ -1065,18 +1067,13 @@ void Ui::select_update(std::vector<Character>& characters, Settings& settings)
             ImGui::SetItemTooltip("%s", entry.name.c_str());
             style_pop();
             ImGui::PopID();
-            ImGui::SameLine();
         }
-        ImGui::SameLine(0, style.ItemSpacing.x * INFO_GAP / 2);
+        float gap = style.ItemSpacing.x * (INFO_GAP + 1);
+        ImGui::SameLine(0, gap);
         ImVec2 cursor = ImGui::GetCursorScreenPos();
-        ImGui::GetWindowDrawList()->AddLine({cursor.x, cursor.y}, {cursor.x, cursor.y + buttonSize},
+        cursor.x -= gap / 2;
+        ImGui::GetWindowDrawList()->AddLine(cursor, {cursor.x, cursor.y + buttonSize},
                                             ImGui::GetColorU32(ImGuiCol_Separator));
-        ImGui::SameLine(0, style.ItemSpacing.x * INFO_GAP / 2);
-        ImGui::BeginDisabled(!selected);
-        if (icon_button("credits", "Credits", BUTTON_NORMAL))
-            panel = PANEL_CREDITS;
-        ImGui::EndDisabled();
-        ImGui::SameLine();
         if (icon_button("settings", "Settings", BUTTON_NORMAL))
             panel = PANEL_SETTINGS;
     }
@@ -1181,14 +1178,7 @@ void Ui::select_update(std::vector<Character>& characters, Settings& settings)
 
     if (window_begin(screen, height))
     {
-        if (panel == PANEL_CREDITS && selected)
-        {
-            ImGui::PushStyleColor(ImGuiCol_Text, imvec4_get(GRAY));
-            ImGui::TextWrapped("%s", selected->credits.empty() ? "No credits listed." : selected->credits.c_str());
-            ImGui::PopStyleColor();
-        }
-        else
-            settings_draw(settings);
+        settings_draw(settings);
         window_end();
     }
 }

src/ui.h

@@ -23,8 +23,7 @@ enum Panel
     PANEL_STATS,
     PANEL_CATALOG,
     PANEL_SETTINGS,
-    PANEL_CHEATS,
-    PANEL_CREDITS
+    PANEL_CHEATS
 };
 
 enum ButtonState