From 87dcbcb6d7dedfacef53896cc15fedfa3cd9a1a6 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Tue, 6 Apr 2021 14:00:00 +0100
Subject: [PATCH] Save 1.5 MiB RAM in-game by freeing more DiabloUI art

---
 Source/diablo.cpp             |  2 +-
 SourceX/DiabloUI/diabloui.cpp | 54 +++++++++++++++++++++--------------
 SourceX/DiabloUI/diabloui.h   |  5 ++--
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 9247eb57d..f7fb79a57 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -377,7 +377,7 @@ BOOL StartGame(BOOL bNewGame, BOOL bSinglePlayer)
 			break;
 		}
 
-		// Save 1.3 MiB of RAM by freeing all main menu resources
+		// Save 2.8 MiB of RAM by freeing all main menu resources
 		// before starting the game.
 		UiDestroy();
 
diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp
index f703888c2..fc2f57f21 100644
--- a/SourceX/DiabloUI/diabloui.cpp
+++ b/SourceX/DiabloUI/diabloui.cpp
@@ -1,23 +1,21 @@
-#include "all.h"
-#include "display.h"
-#include "stubs.h"
-#include "utf8.h"
-#include <string>
+#include "DiabloUI/diabloui.h"
+
 #include <algorithm>
+#include <string>
 
 #include "../3rdParty/Storm/Source/storm.h"
 
+#include "controls/controller.h"
 #include "controls/menu_controls.h"
-
-#include "DiabloUI/scrollbar.h"
-#include "DiabloUI/diabloui.h"
-
 #include "DiabloUI/art_draw.h"
-#include "DiabloUI/text_draw.h"
-#include "DiabloUI/fonts.h"
 #include "DiabloUI/button.h"
 #include "DiabloUI/dialogs.h"
-#include "controls/controller.h"
+#include "DiabloUI/fonts.h"
+#include "DiabloUI/scrollbar.h"
+#include "DiabloUI/text_draw.h"
+#include "display.h"
+#include "stubs.h"
+#include "utf8.h"
 
 #ifdef __SWITCH__
 // for virtual keyboard on Switch
@@ -30,8 +28,8 @@ std::size_t SelectedItemMax;
 std::size_t ListViewportSize = 1;
 const std::size_t *ListOffset = NULL;
 
-Art ArtLogos[3];
-Art ArtFocus[3];
+std::array<Art, 3> ArtLogos;
+std::array<Art, 3> ArtFocus;
 Art ArtBackgroundWidescreen;
 Art ArtBackground;
 Art ArtCursor;
@@ -69,13 +67,6 @@ struct scrollBarState {
 
 } // namespace
 
-void UiDestroy()
-{
-	ArtHero.Unload();
-	UnloadTtfFont();
-	UnloadArtFonts();
-}
-
 void UiInitList(int count, void (*fnFocus)(int value), void (*fnSelect)(int value), void (*fnEsc)(), std::vector<UiItemBase *> items, bool itemsWraps, bool (*fnYesNo)())
 {
 	SelectedItem = 0;
@@ -422,6 +413,8 @@ void UiFocusNavigationYesNo()
 		UiPlaySelectSound();
 }
 
+namespace {
+
 bool IsInsideRect(const SDL_Event &event, const SDL_Rect &rect)
 {
 	const SDL_Point point = { event.button.x, event.button.y };
@@ -489,6 +482,18 @@ void LoadUiGFX()
 	LoadHeros();
 }
 
+void UnloadUiGFX()
+{
+	ArtHero.Unload();
+	ArtCursor.Unload();
+	for (auto &art : ArtFocus)
+		art.Unload();
+	for (auto &art : ArtLogos)
+		art.Unload();
+}
+
+} // namespace
+
 void UiInitialize()
 {
 	LoadUiGFX();
@@ -500,6 +505,13 @@ void UiInitialize()
 	}
 }
 
+void UiDestroy()
+{
+	UnloadTtfFont();
+	UnloadArtFonts();
+	UnloadUiGFX();
+}
+
 char connect_plrinfostr[128];
 char connect_categorystr[128];
 void UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, Uint32 type)
diff --git a/SourceX/DiabloUI/diabloui.h b/SourceX/DiabloUI/diabloui.h
index eb73713d7..a0905170d 100644
--- a/SourceX/DiabloUI/diabloui.h
+++ b/SourceX/DiabloUI/diabloui.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <array>
 #include <cstddef>
 #include <SDL.h>
 
@@ -24,8 +25,8 @@ typedef enum _artLogo {
 	LOGO_BIG,
 } _artLogo;
 
-extern Art ArtLogos[3];
-extern Art ArtFocus[3];
+extern std::array<Art, 3> ArtLogos;
+extern std::array<Art, 3> ArtFocus;
 extern Art ArtBackground;
 extern Art ArtBackgroundWidescreen;
 extern Art ArtCursor;