diasurgical · AJenbo · Sep 18, 2023 · Sep 18, 2023 · Sep 3, 2023 · Sep 18, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
  switch:
  docker:
- - image: devkitpro/devkita64:latest
+ - image: devkitpro/devkita64@sha256:ff45e29f2efab7f70651cee39e1d98952d0db970d78c4d71bcd94efcfb0e4e5f
  working_directory: ~/repo
  steps:
  - checkout

diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml
@@ -49,12 +49,15 @@ jobs:
  env:
  CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}}
  # We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
+ # We set DEVILUTIONX_SYSTEM_LIBSODIUM=OFF because its soversion changes frequently.
  # We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions,
+ # We set DEVILUTIONX_SYSTEM_BZIP2=OFF because Fedora and Debian do not agree on how to link it.
  # and there is no libsimpleini-dev:i386 for Ubuntu 20.04.
  run: |
  cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/linux_i386.toolchain.cmake \
  -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
- -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
+ -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF \
+ -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF -DDEVILUTIONX_SYSTEM_BZIP2=OFF && \
  cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
 
  - name: Package

diff --git a/.github/workflows/Linux_x86_64.yml b/.github/workflows/Linux_x86_64.yml
@@ -45,10 +45,13 @@ jobs:
  env:
  CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}}
  # We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
+ # We set DEVILUTIONX_SYSTEM_LIBSODIUM=OFF because its soversion changes frequently.
  # We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions.
+ # We set DEVILUTIONX_SYSTEM_BZIP2=OFF because Fedora and Debian do not agree on how to link it.
  run: |
  cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
- -DDISCORD_INTEGRATION=ON -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
+ -DDISCORD_INTEGRATION=ON -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF \
+ -DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF -DDEVILUTIONX_SYSTEM_BZIP2=OFF && \
  cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
 
  - name: Package

diff --git a/.github/workflows/Linux_x86_64_test.yml b/.github/workflows/Linux_x86_64_test.yml
@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
  build:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
 
  steps:
  - uses: actions/checkout@v3

diff --git a/.github/workflows/Windows_MSVC_x64.yml b/.github/workflows/Windows_MSVC_x64.yml
@@ -31,9 +31,9 @@ jobs:
  uses: lukka/get-cmake@latest
 
  - name: Restore or setup vcpkg
- uses: lukka/run-vcpkg@v11.1
+ uses: lukka/run-vcpkg@v11.3
  with:
- vcpkgGitCommitId: '927bc12e31148b0d44ae9d174b96c20e3bcf08eb'
+ vcpkgGitCommitId: '16ee2ecb31788c336ace8bb14c21801efb6836e4'
 
  - name: Fetch test data
  run: |

diff --git a/.github/workflows/xbox_nxdk.yml b/.github/workflows/xbox_nxdk.yml
@@ -35,7 +35,7 @@ jobs:
 
  - name: Build nxdk
  shell: bash
- run: PATH="${NXDK_DIR}/bin:$PATH" make -j $(nproc) -C "$NXDK_DIR" NXDK_ONLY=1 all cxbe
+ run: PATH="${NXDK_DIR}/bin:$PATH" make -j $(nproc) -C "$NXDK_DIR" NXDK_ONLY=1 CFLAGS=-O2 CXXFLAGS=-O2 all cxbe
 
  - name: Checkout
  uses: actions/checkout@v3

diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
@@ -15,7 +15,7 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
 include(functions/FetchContent_MakeAvailableExcludeFromAll)
 include(FetchContent)
 FetchContent_Declare(SDL2
- URL https://github.com/libsdl-org/SDL/archive/8b39eb9b1ff885978816dd9663277608187e8676.tar.gz
- URL_HASH MD5=3cf9bf5f20375aa5dcc529193c809967
+ URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+ URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
 )
 FetchContent_MakeAvailableExcludeFromAll(SDL2)
diff --git a/Packaging/nix/devilutionx.metainfo.xml b/Packaging/nix/devilutionx.metainfo.xml
@@ -64,7 +64,20 @@
  </screenshot>
  </screenshots>
  <releases>
- <release version="1.5.1" date="2023-xx-xx">
+ <release version="1.5.2" date="2024-02-04">
+ <description>
+ <p>This release includes the following updates:</p>
+ <ul>
+ <li>Fix issues with joining games due to invalid player data</li>
+ <li>Improve rendering of Chinese/Japanese/Korean texts</li>
+ <li>Fix Hellfire items not saving their identified state</li>
+ <li>Fix stash corrupting when converting a hero between Diablo and Hellfire</li>
+ </ul>
+ <p>Please visit the full changelog for more detailed notes</p>
+ </description>
+ <url>https://github.com/diasurgical/devilutionX/releases/tag/1.5.2</url>
+ </release>
+ <release version="1.5.1" date="2023-09-02">
  <description>
  <p>This is a primarily bugfix release, which includes the following updates:</p>
  <ul>

diff --git a/Source/.clang-format b/Source/.clang-format
@@ -1,7 +1,8 @@
 BasedOnStyle: webkit
 AlignTrailingComments: true
 AllowShortBlocksOnASingleLine: true
-AllowShortFunctionsOnASingleLine: None
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
 PointerAlignment: Right
 TabWidth: 4
 UseTab: ForIndentation

diff --git a/Source/DiabloUI/hero/selhero.cpp b/Source/DiabloUI/hero/selhero.cpp
@@ -151,7 +151,7 @@ void SelheroListSelect(int value)
  if (static_cast<std::size_t>(value) == selhero_SaveCount) {
  vecSelDlgItems.clear();
 
- SDL_Rect rect1 = { (Sint16)(uiPosition.x + 264), (Sint16)(uiPosition.y + 211), 320, 33 };
+ SDL_Rect rect1 = { (Sint16)(uiPosition.x + 242), (Sint16)(uiPosition.y + 211), 365, 33 };
  vecSelDlgItems.push_back(std::make_unique<UiArtText>(_("Choose Class").data(), rect1, UiFlags::AlignCenter | UiFlags::FontSize30 | UiFlags::ColorUiSilver, 3));
 
  vecSelHeroDlgItems.clear();
@@ -176,7 +176,7 @@ void SelheroListSelect(int value)
  SDL_Rect rect2 = { (Sint16)(uiPosition.x + 279), (Sint16)(uiPosition.y + 429), 140, 35 };
  vecSelDlgItems.push_back(std::make_unique<UiArtTextButton>(_("OK"), &UiFocusNavigationSelect, rect2, UiFlags::AlignCenter | UiFlags::FontSize30 | UiFlags::ColorUiGold));
 
- SDL_Rect rect3 = { (Sint16)(uiPosition.x + 429), (Sint16)(uiPosition.y + 429), 140, 35 };
+ SDL_Rect rect3 = { (Sint16)(uiPosition.x + 429), (Sint16)(uiPosition.y + 429), 144, 35 };
  vecSelDlgItems.push_back(std::make_unique<UiArtTextButton>(_("Cancel"), &UiFocusNavigationEsc, rect3, UiFlags::AlignCenter | UiFlags::FontSize30 | UiFlags::ColorUiGold));
 
  UiInitList(SelheroClassSelectorFocus, SelheroClassSelectorSelect, SelheroClassSelectorEsc, vecSelDlgItems, true);
@@ -191,7 +191,7 @@ void SelheroListSelect(int value)
  if (selhero_heroInfo.hassaved) {
  vecSelDlgItems.clear();
 
- SDL_Rect rect1 = { (Sint16)(uiPosition.x + 264), (Sint16)(uiPosition.y + 211), 320, 33 };
+ SDL_Rect rect1 = { (Sint16)(uiPosition.x + 242), (Sint16)(uiPosition.y + 211), 365, 33 };
  vecSelDlgItems.push_back(std::make_unique<UiArtText>(_("Save File Exists").data(), rect1, UiFlags::AlignCenter | UiFlags::FontSize30 | UiFlags::ColorUiSilver, 3));
 
  vecSelHeroDlgItems.clear();
@@ -202,7 +202,7 @@ void SelheroListSelect(int value)
  SDL_Rect rect2 = { (Sint16)(uiPosition.x + 279), (Sint16)(uiPosition.y + 427), 140, 35 };
  vecSelDlgItems.push_back(std::make_unique<UiArtTextButton>(_("OK"), &UiFocusNavigationSelect, rect2, UiFlags::AlignCenter | UiFlags::VerticalCenter | UiFlags::FontSize30 | UiFlags::ColorUiGold));
 
- SDL_Rect rect3 = { (Sint16)(uiPosition.x + 429), (Sint16)(uiPosition.y + 427), 140, 35 };
+ SDL_Rect rect3 = { (Sint16)(uiPosition.x + 429), (Sint16)(uiPosition.y + 427), 144, 35 };
  vecSelDlgItems.push_back(std::make_unique<UiArtTextButton>(_("Cancel"), &UiFocusNavigationEsc, rect3, UiFlags::AlignCenter | UiFlags::VerticalCenter | UiFlags::FontSize30 | UiFlags::ColorUiGold));
 
  UiInitList(SelheroLoadFocus, SelheroLoadSelect, selhero_List_Init, vecSelDlgItems, true);
@@ -278,7 +278,7 @@ void SelheroClassSelectorSelect(int value)
  if (ShouldPrefillHeroName())
  strcpy(selhero_heroInfo.name, SelheroGenerateName(selhero_heroInfo.heroclass));
  vecSelDlgItems.clear();
- SDL_Rect rect1 = { (Sint16)(uiPosition.x + 264), (Sint16)(uiPosition.y + 211), 320, 33 };
+ SDL_Rect rect1 = { (Sint16)(uiPosition.x + 242), (Sint16)(uiPosition.y + 211), 365, 33 };
  vecSelDlgItems.push_back(std::make_unique<UiArtText>(_("Enter Name").data(), rect1, UiFlags::AlignCenter | UiFlags::FontSize30 | UiFlags::ColorUiSilver, 3));
 
  SDL_Rect rect2 = { (Sint16)(uiPosition.x + 265), (Sint16)(uiPosition.y + 317), 320, 33 };
@@ -287,7 +287,7 @@ void SelheroClassSelectorSelect(int value)
  SDL_Rect rect3 = { (Sint16)(uiPosition.x + 279), (Sint16)(uiPosition.y + 429), 140, 35 };
  vecSelDlgItems.push_back(std::make_unique<UiArtTextButton>(_("OK"), &UiFocusNavigationSelect, rect3, UiFlags::AlignCenter | UiFlags::FontSize30 | UiFlags::ColorUiGold));
 
- SDL_Rect rect4 = { (Sint16)(uiPosition.x + 429), (Sint16)(uiPosition.y + 429), 140, 35 };
+ SDL_Rect rect4 = { (Sint16)(uiPosition.x + 429), (Sint16)(uiPosition.y + 429), 144, 35 };
  vecSelDlgItems.push_back(std::make_unique<UiArtTextButton>(_("Cancel"), &UiFocusNavigationEsc, rect4, UiFlags::AlignCenter | UiFlags::FontSize30 | UiFlags::ColorUiGold));
 
  UiInitList(nullptr, SelheroNameSelect, SelheroNameEsc, vecSelDlgItems);
@@ -508,7 +508,7 @@ void selhero_List_Init()
  size_t selectedItem = 0;
  vecSelDlgItems.clear();
 
- SDL_Rect rect1 = { (Sint16)(uiPosition.x + 264), (Sint16)(uiPosition.y + 211), 320, 33 };
+ SDL_Rect rect1 = { (Sint16)(uiPosition.x + 242), (Sint16)(uiPosition.y + 211), 365, 33 };
  vecSelDlgItems.push_back(std::make_unique<UiArtText>(_("Select Hero").data(), rect1, UiFlags::AlignCenter | UiFlags::FontSize30 | UiFlags::ColorUiSilver, 3));
 
  vecSelHeroDlgItems.clear();
@@ -532,7 +532,7 @@ void selhero_List_Init()
  SELLIST_DIALOG_DELETE_BUTTON = setlistDialogDeleteButton.get();
  vecSelDlgItems.push_back(std::move(setlistDialogDeleteButton));
 
- SDL_Rect rect5 = { (Sint16)(uiPosition.x + 489), (Sint16)(uiPosition.y + 429), 120, 35 };
+ SDL_Rect rect5 = { (Sint16)(uiPosition.x + 489), (Sint16)(uiPosition.y + 429), 144, 35 };
  vecSelDlgItems.push_back(std::make_unique<UiArtTextButton>(_("Cancel"), &UiFocusNavigationEsc, rect5, UiFlags::AlignCenter | UiFlags::FontSize30 | UiFlags::ColorUiGold));
 
  UiInitList(SelheroListFocus, SelheroListSelect, SelheroListEsc, vecSelDlgItems, false, nullptr, SelheroListDeleteYesNo, selectedItem);

diff --git a/Source/DiabloUI/multi/selconn.cpp b/Source/DiabloUI/multi/selconn.cpp
@@ -81,7 +81,7 @@ void SelconnLoad()
  SDL_Rect rect9 = { (Sint16)(uiPosition.x + 299), (Sint16)(uiPosition.y + 427), 140, 35 };
  vecSelConnDlg.push_back(std::make_unique<UiArtTextButton>(_("OK"), &UiFocusNavigationSelect, rect9, UiFlags::AlignCenter | UiFlags::VerticalCenter | UiFlags::FontSize30 | UiFlags::ColorUiGold));
 
- SDL_Rect rect10 = { (Sint16)(uiPosition.x + 454), (Sint16)(uiPosition.y + 427), 140, 35 };
+ SDL_Rect rect10 = { (Sint16)(uiPosition.x + 454), (Sint16)(uiPosition.y + 427), 144, 35 };
  vecSelConnDlg.push_back(std::make_unique<UiArtTextButton>(_("Cancel"), &UiFocusNavigationEsc, rect10, UiFlags::AlignCenter | UiFlags::VerticalCenter | UiFlags::FontSize30 | UiFlags::ColorUiGold));
 
  UiInitList(SelconnFocus, SelconnSelect, SelconnEsc, vecSelConnDlg, true);

diff --git a/Source/control.cpp b/Source/control.cpp
@@ -255,7 +255,7 @@ void PrintInfo(const Surface &out)
  return;
 
  const int space[] = { 18, 12, 6, 3, 0 };
- Rectangle infoArea { GetMainPanel().position + Displacement { 177, 46 }, { 288, 60 } };
+ Rectangle infoArea { GetMainPanel().position + InfoBoxTopLeft, InfoBoxSize };
 
  const int newLineCount = std::count(InfoString.str().begin(), InfoString.str().end(), '\n');
  const int spaceIndex = std::min(4, newLineCount);
@@ -1000,6 +1000,7 @@ void DoAutoMap()
 void CheckPanelInfo()
 {
  panelflag = false;
+ InfoString = StringOrView {};
  const Point mainPanelPosition = GetMainPanel().position;
  for (int i = 0; i < PanelButtonIndex; i++) {
  int xend = PanBtnPos[i].x + mainPanelPosition.x + PanBtnPos[i].w;
@@ -1161,7 +1162,7 @@ void FreeControlPan()
 
 void DrawInfoBox(const Surface &out)
 {
- DrawPanelBox(out, { 177, 62, 288, 63 }, GetMainPanel().position + Displacement { 177, 46 });
+ DrawPanelBox(out, { 177, 62, InfoBoxSize.width, InfoBoxSize.height }, GetMainPanel().position + InfoBoxTopLeft);
  if (!panelflag && !trigflag && pcursinvitem == -1 && pcursstashitem == StashStruct::EmptyCell && !spselflag) {
  InfoString = {};
  InfoColor = UiFlags::ColorWhite;

diff --git a/Source/control.h b/Source/control.h
@@ -16,9 +16,11 @@
 
 #include "DiabloUI/ui_flags.hpp"
 #include "engine.h"
+#include "engine/displacement.hpp"
 #include "engine/point.hpp"
 #include "engine/rectangle.hpp"
 #include "engine/render/text_render.hpp"
+#include "engine/size.hpp"
 #include "panels/ui_panels.hpp"
 #include "spelldat.h"
 #include "spells.h"
@@ -32,6 +34,10 @@ namespace devilution {
 
 constexpr Size SidePanelSize { 320, 352 };
 
+// Info box displacement of the top-left corner relative to GetMainPanel().position.
+constexpr Displacement InfoBoxTopLeft { 177, 46 };
+constexpr Size InfoBoxSize { 288, 64 };
+
 extern bool dropGoldFlag;
 extern bool chrbtn[4];
 extern bool lvlbtndown;

diff --git a/Source/debug.cpp b/Source/debug.cpp
@@ -24,6 +24,7 @@
 #include "lighting.h"
 #include "monstdat.h"
 #include "monster.h"
+#include "pack.h"
 #include "plrmsg.h"
 #include "quests.h"
 #include "spells.h"
@@ -902,7 +903,29 @@ std::string DebugCmdItemInfo(const string_view parameter)
  pItem = &Items[pcursitem];
  }
  if (pItem != nullptr) {
- return StrCat("Name: ", pItem->_iIName, "\nIDidx: ", pItem->IDidx, "\nSeed: ", pItem->_iSeed, "\nCreateInfo: ", pItem->_iCreateInfo);
+ std::string_view netPackValidation { "N/A" };
+ if (gbIsMultiplayer) {
+ ItemNetPack itemPack;
+ Item unpacked;
+ PackNetItem(*pItem, itemPack);
+ netPackValidation = UnPackNetItem(myPlayer, itemPack, unpacked) ? "Success" : "Failure";
+ }
+ return StrCat("Name: ", pItem->_iIName,
+ "\nIDidx: ", pItem->IDidx, " (", AllItemsList[pItem->IDidx].iName, ")",
+ "\nSeed: ", pItem->_iSeed,
+ "\nCreateInfo: ", pItem->_iCreateInfo,
+ "\nLevel: ", pItem->_iCreateInfo & CF_LEVEL,
+ "\nOnly Good: ", ((pItem->_iCreateInfo & CF_ONLYGOOD) == 0) ? "False" : "True",
+ "\nUnique Monster: ", ((pItem->_iCreateInfo & CF_UPER15) == 0) ? "False" : "True",
+ "\nDungeon Item: ", ((pItem->_iCreateInfo & CF_UPER1) == 0) ? "False" : "True",
+ "\nUnique Item: ", ((pItem->_iCreateInfo & CF_UNIQUE) == 0) ? "False" : "True",
+ "\nSmith: ", ((pItem->_iCreateInfo & CF_SMITH) == 0) ? "False" : "True",
+ "\nSmith Premium: ", ((pItem->_iCreateInfo & CF_SMITHPREMIUM) == 0) ? "False" : "True",
+ "\nBoy: ", ((pItem->_iCreateInfo & CF_BOY) == 0) ? "False" : "True",
+ "\nWitch: ", ((pItem->_iCreateInfo & CF_WITCH) == 0) ? "False" : "True",
+ "\nHealer: ", ((pItem->_iCreateInfo & CF_HEALER) == 0) ? "False" : "True",
+ "\nPregen: ", ((pItem->_iCreateInfo & CF_PREGEN) == 0) ? "False" : "True",
+ "\nNet Validation: ", netPackValidation);
  }
  return StrCat("Numitems: ", ActiveItemCount);
 }
@@ -1133,7 +1156,7 @@ bool CheckDebugTextCommand(const string_view text)
  const auto result = dbgCmd.actionProc(parameter);
  Log("DebugCmd: {} Result: {}", text, result);
  if (result != "")
- InitDiabloMsg(result);
+ EventPlrMsg(result, UiFlags::ColorRed);
  return true;
 }
 

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
@@ -2736,7 +2736,10 @@ void LoadGameLevel(bool firstflag, lvl_entry lvldir)
  }
 
  if (firstflag || lvldir == ENTRY_LOAD) {
+ bool isHellfireSaveGame = gbIsHellfireSaveGame;
+ gbIsHellfireSaveGame = gbIsHellfire;
  LoadStash();
+ gbIsHellfireSaveGame = isHellfireSaveGame;
  }
 
  IncProgress();

diff --git a/Source/engine.cpp b/Source/engine.cpp
@@ -52,11 +52,7 @@ void DrawHalfTransparentAligned32BlendedRectTo(const Surface &out, unsigned sx,
  while (height-- > 0) {
  for (unsigned i = 0; i < width; ++i, ++pix) {
  const uint32_t v = *pix;
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
  *pix = lookupTable[v & 0xFFFF] | (lookupTable[(v >> 16) & 0xFFFF] << 16);
-#else
- *pix = lookupTable[(v >> 16) & 0xFFFF] | (lookupTable[v & 0xFFFF] << 16);
-#endif
  }
  pix += skipX;
  }

diff --git a/Source/engine/displacement.hpp b/Source/engine/displacement.hpp
@@ -120,7 +120,8 @@ struct DisplacementOf {
 
  float magnitude() const
  {
- return static_cast<float>(hypot(deltaX, deltaY));
+ // We do not use `std::hypot` here because it is slower and we do not need the extra precision.
+ return sqrtf(deltaX * deltaX + deltaY * deltaY);
  }
 
  /**

diff --git a/Source/engine/palette.cpp b/Source/engine/palette.cpp
@@ -103,11 +103,7 @@ void GenerateBlendedLookupTable(std::array<SDL_Color, 256> &palette, int skipFro
 #if DEVILUTIONX_PALETTE_TRANSPARENCY_BLACK_16_LUT
  for (unsigned i = 0; i < 256; ++i) {
  for (unsigned j = 0; j < 256; ++j) {
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
  const std::uint16_t index = i | (j << 8);
-#else
- const std::uint16_t index = j | (i << 8);
-#endif
  paletteTransparencyLookupBlack16[index] = paletteTransparencyLookup[0][i] | (paletteTransparencyLookup[0][j] << 8);
  }
  }

diff --git a/Source/engine/render/scrollrt.cpp b/Source/engine/render/scrollrt.cpp
@@ -1343,7 +1343,8 @@ void DrawMain(const Surface &out, int dwHgt, bool drawDesc, bool drawHp, bool dr
  // When chat input is displayed, the belt is hidden and the chat moves up.
  DoBlitScreen(mainPanelPosition.x + 171, mainPanelPosition.y + 6, 298, 116);
  } else {
- DoBlitScreen(mainPanelPosition.x + 176, mainPanelPosition.y + 46, 288, 63);
+ DoBlitScreen(mainPanelPosition.x + InfoBoxTopLeft.deltaX, mainPanelPosition.y + InfoBoxTopLeft.deltaY,
+ InfoBoxSize.width, InfoBoxSize.height);
  }
  }
  if (drawMana) {