From 3b4db479953ef48ccd7e18cd17507038facfd6e1 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Wed, 30 Sep 2020 00:33:27 +0200
Subject: [PATCH] Correct placment of Diablo logo on title screen

Fixes #841
---
 SourceX/DiabloUI/diabloui.cpp | 4 ++--
 SourceX/DiabloUI/diabloui.h   | 2 +-
 SourceX/DiabloUI/title.cpp    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp
index fbd996be0..aec6e9139 100644
--- a/SourceX/DiabloUI/diabloui.cpp
+++ b/SourceX/DiabloUI/diabloui.cpp
@@ -600,9 +600,9 @@ void UiAddBackground(std::vector<UiItemBase *> *vecDialog)
 	vecDialog->push_back(new UiImage(&ArtBackground, rect));
 }
 
-void UiAddLogo(std::vector<UiItemBase *> *vecDialog, int size, int height)
+void UiAddLogo(std::vector<UiItemBase *> *vecDialog, int size, int y)
 {
-	SDL_Rect rect = { 0, UI_OFFSET_Y + height, 0, 0 };
+	SDL_Rect rect = { 0, UI_OFFSET_Y + y, 0, 0 };
 	vecDialog->push_back(new UiImage(&ArtLogos[size], /*animated=*/true, /*frame=*/0, rect, UIS_CENTER));
 }
 
diff --git a/SourceX/DiabloUI/diabloui.h b/SourceX/DiabloUI/diabloui.h
index 4c60795d6..d87f037fe 100644
--- a/SourceX/DiabloUI/diabloui.h
+++ b/SourceX/DiabloUI/diabloui.h
@@ -40,7 +40,7 @@ void LoadPalInMem(const SDL_Color *pPal);
 void DrawMouse();
 void LoadBackgroundArt(const char *pszFile);
 void UiAddBackground(std::vector<UiItemBase *> *vecDialog);
-void UiAddLogo(std::vector<UiItemBase *> *vecDialog, int size = LOGO_MED, int height = 0);
+void UiAddLogo(std::vector<UiItemBase *> *vecDialog, int size = LOGO_MED, int y = 0);
 void UiFocusNavigationSelect();
 void UiFocusNavigationEsc();
 void UiFocusNavigationYesNo();
diff --git a/SourceX/DiabloUI/title.cpp b/SourceX/DiabloUI/title.cpp
index fa6e5a92b..386cc58ce 100644
--- a/SourceX/DiabloUI/title.cpp
+++ b/SourceX/DiabloUI/title.cpp
@@ -27,7 +27,7 @@ void title_Free()
 void UiTitleDialog()
 {
 	UiAddBackground(&vecTitleScreen);
-	UiAddLogo(&vecTitleScreen, LOGO_BIG, (UI_OFFSET_Y + 182));
+	UiAddLogo(&vecTitleScreen, LOGO_BIG, 182);
 
 	SDL_Rect rect = { PANEL_LEFT + 49, (UI_OFFSET_Y + 410), 550, 26 };
 	vecTitleScreen.push_back(new UiArtText("Copyright \xA9 1996-2001 Blizzard Entertainment", rect, UIS_MED | UIS_CENTER));