From e3e97c23fc6a92b87356fc2484c7f8b12d71bf19 Mon Sep 17 00:00:00 2001 From: Ryan Payton Date: Mon, 24 Apr 2023 12:58:21 -0400 Subject: [PATCH] General UI positioning fixes --- IO/UITypes/UIItemInventory.cpp | 4 ++-- IO/UITypes/UIQuit.cpp | 2 +- IO/UITypes/UIStatsInfo.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/IO/UITypes/UIItemInventory.cpp b/IO/UITypes/UIItemInventory.cpp index 960a822..e80017c 100644 --- a/IO/UITypes/UIItemInventory.cpp +++ b/IO/UITypes/UIItemInventory.cpp @@ -230,14 +230,14 @@ namespace ms { if (newtab == tab) { - newitemtaben.draw(position + get_tabpos(newtab), alpha); + newitemtaben.draw(position + get_tabpos(newtab) - Point(2, 3), alpha); if (is_visible(newslot)) newitemslot.draw(position + get_slotpos(newslot) + Point(1, 1), alpha); } else { - newitemtabdis.draw(position + get_tabpos(newtab), alpha); + newitemtabdis.draw(position + get_tabpos(newtab) - Point(2, 1), alpha); } } } diff --git a/IO/UITypes/UIQuit.cpp b/IO/UITypes/UIQuit.cpp index ea1239a..8fa3bd9 100644 --- a/IO/UITypes/UIQuit.cpp +++ b/IO/UITypes/UIQuit.cpp @@ -80,7 +80,7 @@ namespace ms cur_level = stats.get_stat(MapleStat::Id::LEVEL); levelAfter = Charset(level["number"], Charset::Alignment::LEFT); - levelAfterPos = level["posAfter"]; + levelAfterPos = Point(level["posAfter"]) - Point(10, 0); levelAfterText = std::to_string(cur_level); levelNumberWidth = level["numberWidth"]; diff --git a/IO/UITypes/UIStatsInfo.cpp b/IO/UITypes/UIStatsInfo.cpp index b12ce6f..38e6b31 100644 --- a/IO/UITypes/UIStatsInfo.cpp +++ b/IO/UITypes/UIStatsInfo.cpp @@ -116,11 +116,11 @@ namespace ms statoffsets[StatLabel::MAX_DAMAGE] = statoffset + Point(19, statoffset_y * 5); statoffsets[StatLabel::HP] = statoffset + Point(1, statoffset_y * 6); statoffsets[StatLabel::MP] = statoffset + Point(1, statoffset_y * 7); - statoffsets[StatLabel::AP] = statoffset + Point(18, 149); - statoffsets[StatLabel::STR] = statoffset + Point(0, 178); - statoffsets[StatLabel::DEX] = statoffset + Point(0, 196); - statoffsets[StatLabel::INT] = statoffset + Point(0, 214); - statoffsets[StatLabel::LUK] = statoffset + Point(0, 232); + statoffsets[StatLabel::AP] = statoffset + Point(19, 167); + statoffsets[StatLabel::STR] = statoffset + Point(1, 196); + statoffsets[StatLabel::DEX] = statoffset + Point(1, 214); + statoffsets[StatLabel::INT] = statoffset + Point(1, 232); + statoffsets[StatLabel::LUK] = statoffset + Point(1, 250); // Detailed statlabels[StatLabel::MIN_DAMAGE_DETAILED] = Text(Text::Font::A11M, Text::Alignment::RIGHT, Color::Name::EMPEROR);