From c1b5cccfae51dedf99372bb5464cab767f8ff0f5 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Thu, 7 Jan 2021 07:26:19 +0100 Subject: [PATCH] Fix windows builds --- DiabloUI/diabloui.h | 4 ++-- SourceX/DiabloUI/selhero.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DiabloUI/diabloui.h b/DiabloUI/diabloui.h index e44223792..3267f299b 100644 --- a/DiabloUI/diabloui.h +++ b/DiabloUI/diabloui.h @@ -9,8 +9,8 @@ void UiTitleDialog(); void UiSetSpawned(BOOL bSpawned); void UiInitialize(); BOOL UiValidPlayerName(const char *name); /* check */ -BOOL UiSelHeroMultDialog(BOOL(*fninfo)(BOOL(*fninfofunc)(_uiheroinfo *)), BOOL(*fncreate)(_uiheroinfo *), BOOL(*fnremove)(_uiheroinfo *), BOOL(*fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, BOOL *hero_is_created, char *name); -BOOL UiSelHeroSingDialog(BOOL(*fninfo)(BOOL(*fninfofunc)(_uiheroinfo *)), BOOL(*fncreate)(_uiheroinfo *), BOOL(*fnremove)(_uiheroinfo *), BOOL(*fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty); +BOOL UiSelHeroMultDialog(BOOL(*fninfo)(BOOL(*fninfofunc)(_uiheroinfo *)), BOOL(*fncreate)(_uiheroinfo *), BOOL(*fnremove)(_uiheroinfo *), void(*fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, BOOL *hero_is_created, char *name); +BOOL UiSelHeroSingDialog(BOOL(*fninfo)(BOOL(*fninfofunc)(_uiheroinfo *)), BOOL(*fncreate)(_uiheroinfo *), BOOL(*fnremove)(_uiheroinfo *), void(*fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty); BOOL UiCreditsDialog(int a1); BOOL UiMainMenuDialog(const char *name, int *pdwResult, void(*fnSound)(const char *file), int attractTimeOut); BOOL UiProgressDialog(const char *msg, int enable, int(*fnfunc)(), int rate); diff --git a/SourceX/DiabloUI/selhero.cpp b/SourceX/DiabloUI/selhero.cpp index 53c60f705..746c0247d 100644 --- a/SourceX/DiabloUI/selhero.cpp +++ b/SourceX/DiabloUI/selhero.cpp @@ -35,7 +35,7 @@ BOOL(*gfnHeroInfo) (BOOL (*fninfofunc)(_uiheroinfo *)); BOOL(*gfnHeroCreate) (_uiheroinfo *); -BOOL(*gfnHeroStats) +void(*gfnHeroStats) (unsigned int, _uidefaultstats *); namespace { @@ -467,7 +467,7 @@ BOOL SelHero_GetHeroInfo(_uiheroinfo *pInfo) BOOL UiSelHeroDialog( BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)), BOOL (*fncreate)(_uiheroinfo *), - BOOL (*fnstats)(unsigned int, _uidefaultstats *), + void (*fnstats)(unsigned int, _uidefaultstats *), BOOL (*fnremove)(_uiheroinfo *), int *dlgresult, char *name) @@ -528,7 +528,7 @@ BOOL UiSelHeroSingDialog( BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)), BOOL (*fncreate)(_uiheroinfo *), BOOL (*fnremove)(_uiheroinfo *), - BOOL (*fnstats)(unsigned int, _uidefaultstats *), + void (*fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty) @@ -543,7 +543,7 @@ BOOL UiSelHeroMultDialog( BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)), BOOL (*fncreate)(_uiheroinfo *), BOOL (*fnremove)(_uiheroinfo *), - BOOL (*fnstats)(unsigned int, _uidefaultstats *), + void (*fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, BOOL *hero_is_created, char *name)