From 7d27f1985b8a5a7c6fbd4b09e8934b46ccc26344 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 14 Oct 2018 20:50:50 +0200 Subject: [PATCH] Correct type for fullscreen --- Source/diablo.cpp | 5 ++--- Source/diablo.h | 2 +- Source/dx.cpp | 1 - Source/init.cpp | 1 - Source/palette.cpp | 2 -- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Source/diablo.cpp b/Source/diablo.cpp index e6dc7ad0e..953d66e68 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -39,7 +39,7 @@ int diablo_inf = 0x7F800000; // weak /* rdata */ -int fullscreen = 1; // weak +BOOL fullscreen = TRUE; #ifdef _DEBUG int showintrodebug = 1; int questdebug = -1; @@ -451,7 +451,7 @@ void __fastcall diablo_parse_flags(char *args) debug_mode_key_w = 1; break; case 'x': - fullscreen = 0; + fullscreen = FALSE; break; default: break; @@ -2283,6 +2283,5 @@ void __cdecl diablo_color_cyc_logic() } } } -// 484364: using guessed type int fullscreen; // 52574C: using guessed type int color_cycle_timer; // 5BB1ED: using guessed type char leveltype; diff --git a/Source/diablo.h b/Source/diablo.h index 6f28b83c2..c290daf6b 100644 --- a/Source/diablo.h +++ b/Source/diablo.h @@ -76,7 +76,7 @@ extern int diablo_inf; // weak /* rdata */ -extern int fullscreen; // weak +extern BOOL fullscreen; #ifdef _DEBUG extern int showintrodebug; extern int questdebug; diff --git a/Source/dx.cpp b/Source/dx.cpp index 4ddf99ac2..8059d1d31 100644 --- a/Source/dx.cpp +++ b/Source/dx.cpp @@ -100,7 +100,6 @@ void __fastcall dx_init(HWND hWnd) dx_create_back_buffer(); SDrawManualInitialize(hWnda, lpDDInterface, lpDDSPrimary, 0, 0, lpDDSBackBuf, lpDDPalette, 0); } -// 484364: using guessed type int fullscreen; // 52A549: using guessed type char gbEmulate; void __cdecl dx_create_back_buffer() diff --git a/Source/init.cpp b/Source/init.cpp index 0ec6eb90f..9aeb4ec56 100644 --- a/Source/init.cpp +++ b/Source/init.cpp @@ -503,7 +503,6 @@ void __fastcall init_activate_window(HWND hWnd, bool bActive) ResetPal(); } } -// 484364: using guessed type int fullscreen; // 52571C: using guessed type int drawpanflag; // 634980: using guessed type int gbActive; diff --git a/Source/palette.cpp b/Source/palette.cpp index 26077e72c..c7dbf54d2 100644 --- a/Source/palette.cpp +++ b/Source/palette.cpp @@ -99,7 +99,6 @@ void __cdecl LoadSysPal() ReleaseDC(NULL, hDC); } } -// 484364: using guessed type int fullscreen; void __fastcall LoadPalette(char *pszFileName) { @@ -176,7 +175,6 @@ void __cdecl palette_update() SDrawUpdatePalette(v0, v1, &system_palette[v0], 0); } } -// 484364: using guessed type int fullscreen; void __fastcall ApplyGamma(PALETTEENTRY *dst, PALETTEENTRY *src, int n) {