From b58b3300c46ef01552e75b003557f04ff24d0eb2 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sun, 18 Aug 2019 20:25:04 +0200
Subject: [PATCH] Clean up attract mode

---
 DiabloUI/diabloui.h           |  2 +-
 SourceX/DiabloUI/mainmenu.cpp | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/DiabloUI/diabloui.h b/DiabloUI/diabloui.h
index 68a909d2f..f66f7100c 100644
--- a/DiabloUI/diabloui.h
+++ b/DiabloUI/diabloui.h
@@ -40,7 +40,7 @@ BOOL __fastcall UiValidPlayerName(char *name); /* check __stdcall */
 BOOL __stdcall UiSelHeroMultDialog(BOOL(__stdcall *fninfo)(BOOL(__stdcall *fninfofunc)(_uiheroinfo *)), BOOL(__stdcall *fncreate)(_uiheroinfo *), BOOL(__stdcall *fnremove)(_uiheroinfo *), BOOL(__stdcall *fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, int *a6, char *name);
 BOOL __stdcall UiSelHeroSingDialog(BOOL(__stdcall *fninfo)(BOOL(__stdcall *fninfofunc)(_uiheroinfo *)), BOOL(__stdcall *fncreate)(_uiheroinfo *), BOOL(__stdcall *fnremove)(_uiheroinfo *), BOOL(__stdcall *fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty);
 BOOL __stdcall UiCreditsDialog(int a1);
-BOOL __stdcall UiMainMenuDialog(char *name, int *pdwResult, void(__stdcall *fnSound)(char *file), int a4);
+BOOL __stdcall UiMainMenuDialog(char *name, int *pdwResult, void(__stdcall *fnSound)(char *file), int attractTimeOut);
 BOOL __stdcall UiProgressDialog(HWND window, char *msg, int enable, int(*fnfunc)(), int rate);
 int __stdcall UiProfileGetString();
 void __cdecl UiProfileCallback();
diff --git a/SourceX/DiabloUI/mainmenu.cpp b/SourceX/DiabloUI/mainmenu.cpp
index 6d92d140a..941641e6f 100644
--- a/SourceX/DiabloUI/mainmenu.cpp
+++ b/SourceX/DiabloUI/mainmenu.cpp
@@ -3,8 +3,8 @@
 
 namespace dvl {
 
-int mainmenu_repintro_delay; //seconds
-DWORD dwTicks;
+int mainmenu_attract_time_out; //seconds
+DWORD dwAttractTicks;
 
 int MainMenuResult;
 UI_Item MAINMENU_DIALOG[] = {
@@ -29,7 +29,7 @@ void mainmenu_Esc()
 
 void mainmenu_restart_repintro()
 {
-	dwTicks = GetTickCount() + mainmenu_repintro_delay * 1000;
+	dwAttractTicks = GetTickCount() + mainmenu_attract_time_out * 1000;
 }
 
 void mainmenu_Load(char *name, void(*fnSound)(char *file))
@@ -53,19 +53,18 @@ void mainmenu_Free()
 	ArtBackground.data = NULL;
 }
 
-BOOL UiMainMenuDialog(char *name, int *pdwResult, void(*fnSound)(char *file), int a4)
+BOOL UiMainMenuDialog(char *name, int *pdwResult, void(*fnSound)(char *file), int attractTimeOut)
 {
-	mainmenu_repintro_delay = a4;
+	mainmenu_attract_time_out = attractTimeOut;
 	mainmenu_Load(name, fnSound);
 	
 	mainmenu_restart_repintro(); // for automatic starts
 
 	while (MainMenuResult == 0) {
-		if (GetTickCount() >= dwTicks) {
-			mainmenu_play_intro();
-			break;
-		}
 		UiRender();
+		if (GetTickCount() >= dwAttractTicks) {
+			MainMenuResult = MAINMENU_ATTRACT_MODE;
+		}
 	}
 
 	BlackPalette();