diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d1e11c2f..b257d15be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,7 @@ endif()
 # Note: In Debug mode, GCC generates spurious memory references that upset Valgrind,
 # these options fix that.
 string(APPEND CMAKE_CXX_FLAGS_DEBUG " -fno-omit-frame-pointer")
+string(APPEND CMAKE_CXX_FLAGS_DEBUG " -fsanitize=address -fsanitize-recover=address")
 
 find_package(SDL2 REQUIRED)
 find_package(SDL2_mixer REQUIRED)
@@ -60,7 +61,7 @@ set(SOURCES
     Source/encrypt.cpp
     Source/engine.cpp
     Source/error.cpp
-#   Source/gamemenu.cpp
+    Source/gamemenu.cpp
     Source/gendung.cpp
     Source/gmenu.cpp
     Source/help.cpp
@@ -141,7 +142,6 @@ set(STUB_SOURCES
     Stub/storm_net.cpp
 #   Stub/validate.cpp
     Stub/sdlrender.cpp
-    Stub/gamemenu.cpp
 
     3rdParty/StormLib/src/FileStream.cpp
     3rdParty/StormLib/src/SBaseCommon.cpp
diff --git a/Source/diablo.h b/Source/diablo.h
index c5aac3902..6bd341f68 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -32,9 +32,6 @@ extern int debugmonsttypes;   // weak
 extern int PauseMode;         // weak
 extern char sgbMouseDown;     // weak
 extern int color_cycle_timer; // weak
-extern bool CUSTOM_SDL_KEY_LSHIFT;
-
-
 
 void __cdecl FreeGameMem();
 BOOL __fastcall StartGame(BOOL bNewGame, BOOL bSinglePlayer);
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 44d664852..65915fb5a 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -97,23 +97,6 @@ void __fastcall pfile_encode_hero(const PkPlayerStruct *pPack)
 
 BOOL __fastcall pfile_open_archive(BOOL a1, unsigned int save_num)
 {
-#ifdef ANDROID
-    char SaveDir[MAX_PATH] = "/sdcard/Diablo/"; // Full path to SAVDIR
-    char FileName[MAX_PATH];
-
-
-    pfile_get_save_path(FileName, sizeof(FileName), save_num);
-
-    strcat(SaveDir,FileName+2);
-    printf("FULL ITEM ? %s \n", SaveDir );
-    strcpy(FileName, SaveDir);
-    if ( mpqapi_open_archive(FileName, FALSE, save_num) )
-        return TRUE;
-
-    if ( a1 && gbMaxPlayers > 1 )
-        mpqapi_update_multi_creation_time(save_num);
-    return FALSE;
-#else
 	char FileName[MAX_PATH];
 
 	pfile_get_save_path(FileName, sizeof(FileName), save_num);
@@ -123,7 +106,6 @@ BOOL __fastcall pfile_open_archive(BOOL a1, unsigned int save_num)
 	if (a1 && gbMaxPlayers > 1)
 		mpqapi_update_multi_creation_time(save_num);
 	return FALSE;
-#endif
 }
 
 void __fastcall pfile_get_save_path(char *pszBuf, DWORD dwBufSize, unsigned int save_num)
@@ -374,20 +356,6 @@ BOOL __fastcall pfile_read_hero(HANDLE archive, PkPlayerStruct *pPack)
 
 HANDLE __fastcall pfile_open_save_archive(int *unused, unsigned int save_num)
 {
-#ifdef ANDROID
-    char SaveDir[MAX_PATH] = "/sdcard/Diablo/"; // Full path to SAVDIR
-    char SrcStr[MAX_PATH];
-    HANDLE archive;
-
-    pfile_get_save_path(SrcStr, sizeof(SrcStr), save_num);
-
-    strcat(SaveDir,SrcStr+2);
-    printf("FULL ITEM ? %s \n", SaveDir );
-    strcpy(SrcStr, SaveDir);
-    if ( SFileOpenArchive(SrcStr, 0x7000, 0, &archive) )
-        return archive;
-    return NULL;
-#else   // IF NOT ANDROID
 	char SrcStr[MAX_PATH];
 	HANDLE archive;
 
@@ -395,7 +363,6 @@ HANDLE __fastcall pfile_open_save_archive(int *unused, unsigned int save_num)
 	if (SFileOpenArchive(SrcStr, 0x7000, 0, &archive))
 		return archive;
 	return NULL;
-#endif
 }
 
 void __fastcall pfile_SFileCloseArchive(HANDLE hsArchive)
diff --git a/Stub/diablo.cpp b/Stub/diablo.cpp
deleted file mode 100644
index 0730adc68..000000000
--- a/Stub/diablo.cpp
+++ /dev/null
@@ -1,2337 +0,0 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
-
-
-
-#include "miniwin_sdl.h"
-#include "stubs.h"
-
-
-
-#ifndef NO_GLOBALS
-int diablo_cpp_init_value; // weak
-
-HWND ghMainWnd;
-int glMid1Seed[NUMLEVELS];
-int glMid2Seed[NUMLEVELS];
-int gnLevelTypeTbl[NUMLEVELS];
-int MouseY; // idb
-int MouseX; // idb
-BOOL gbGameLoopStartup; // idb
-int glSeedTbl[NUMLEVELS];
-int gbRunGame; // weak
-int glMid3Seed[NUMLEVELS];
-int gbRunGameResult; // weak
-int zoomflag; // weak
-int gbProcessPlayers; // weak
-int glEndSeed[NUMLEVELS];
-BOOL gbLoadGame;
-HINSTANCE ghInst; // idb
-int DebugMonsters[10];
-char cineflag; // weak
-int drawpanflag; // weak
-int visiondebug; // weak
-int scrollflag; /* unused */
-BOOL light4flag;
-int leveldebug; // weak
-int monstdebug; // weak
-int trigdebug; /* unused */
-int setseed; // weak
-int debugmonsttypes; // weak
-int PauseMode; // weak
-int sgnTimeoutCurs;
-char sgbMouseDown; // weak
-int color_cycle_timer; // weak
-#endif
-
-int diablo_inf = 0x7F800000; // weak
-
-/* rdata */
-
-int fullscreen = 1; // weak
-#ifdef _DEBUG
-int showintrodebug = 1;
-int questdebug = -1;
-int debug_mode_key_s;
-int debug_mode_key_w;
-int debug_mode_key_inverted_v;
-int debug_mode_dollar_sign;
-int debug_mode_key_d;
-int debug_mode_key_i;
-int dbgplr;
-int dbgqst;
-int dbgmon;
-int arrowdebug;
-int frameflag;
-int frameend;
-int framerate;
-int framestart;
-#endif
-BOOL FriendlyMode = TRUE;
-char *spszMsgTbl[4] =
-{
-  "I need help! Come Here!",
-  "Follow me.",
-  "Here's something for you.",
-  "Now you DIE!"
-}; // weak
-char *spszMsgKeyTbl[4] = { "F9", "F10", "F11", "F12" }; // weak
-
-struct diablo_cpp_init
-{
-	diablo_cpp_init()
-	{
-		diablo_cpp_init_value = diablo_inf;
-	}
-} _diablo_cpp_init;
-// 479BF8: using guessed type int diablo_inf;
-// 525514: using guessed type int diablo_cpp_init_value;
-
-void __cdecl FreeGameMem()
-{
-	DUMMY();
-	void *v0; // ecx
-	void *v1; // ecx
-	void *v2; // ecx
-	void *v3; // ecx
-	void *v4; // ecx
-
-	music_stop();
-	v0 = pDungeonCels;
-	pDungeonCels = 0;
-	mem_free_dbg(v0);
-	v1 = pMegaTiles;
-	pMegaTiles = 0;
-	mem_free_dbg(v1);
-	v2 = pLevelPieces;
-	pLevelPieces = 0;
-	mem_free_dbg(v2);
-	v3 = level_special_cel;
-	level_special_cel = 0;
-	mem_free_dbg(v3);
-	v4 = pSpeedCels;
-	pSpeedCels = 0;
-	mem_free_dbg(v4);
-	FreeMissiles();
-	FreeMonsters();
-	FreeObjectGFX();
-	//FreeEffects(); // Not Working Yet....
-	FreeTownerGFX();
-}
-
-BOOL __fastcall StartGame(BOOL a1, BOOL bSinglePlayer)
-{
-	DUMMY();
-	int v2; // esi
-	int v3; // edi
-	int v4; // ecx
-	int pfExitProgram; // [esp+Ch] [ebp-4h]
-
-	v2 = bSinglePlayer;
-	v3 = a1;
-	byte_678640 = 1;
-
-	while ( 1 )
-	{
-		pfExitProgram = 0;
-		gbLoadGame = FALSE;
-		if ( !NetInit(v2, &pfExitProgram) )
-			break;
-		byte_678640 = 0;
-		if ( (v3 || !gbValidSaveFile) && (InitLevels(), InitQuests(), InitPortals(), InitDungMsgs(myplr), !gbValidSaveFile) || (v4 = WM_DIABLOADGAME, !gbLoadGame) )
-		{
-			v4 = WM_DIABNEWGAME;
-		}
-		run_game_loop(v4);
-		NetClose();
-		pfile_create_player_description(0, 0);
-		if ( !gbRunGameResult )
-			goto LABEL_11;
-	}
-	gbRunGameResult = pfExitProgram == 0;
-LABEL_11:
-	SNetDestroy();
-	return gbRunGameResult;
-}
-// 525698: using guessed type int gbRunGameResult;
-// 678640: using guessed type char byte_678640;
-
-void __fastcall run_game_loop(unsigned int uMsg)
-{
-	DUMMY();
-	//int v3; // eax
-	bool v5; // zf
-	//int v6; // eax
-	signed int v7; // [esp+8h] [ebp-24h]
-	WNDPROC saveProc; // [esp+Ch] [ebp-20h]
-	struct tagMSG msg; // [esp+10h] [ebp-1Ch]
-
-
-
-	nthread_ignore_mutex(1);
-	start_game(uMsg);
-	saveProc = SetWindowProc(GM_Game);
-	control_update_life_mana();
-	msg_process_net_packets();
-	gbRunGame = 1;
-	gbProcessPlayers = 1;
-	gbRunGameResult = 1;
-	drawpanflag = 255;
-	DrawAndBlit();
-	PaletteFadeIn(8);
-	drawpanflag = 255;
-	gbGameLoopStartup = 1;
-	nthread_ignore_mutex(0);
-	while ( gbRunGame )
-	{
-		diablo_color_cyc_logic();
-		if ( PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) )
-		{
-			SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL);
-			while ( PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) )
-			{
-				if ( msg.message == WM_QUIT )
-				{
-					gbRunGameResult = 0;
-					gbRunGame = 0;
-					break;
-				}
-				TranslateMessage(&msg);
-				DispatchMessage(&msg);
-			}
-			if ( !gbRunGame || (v7 = 1, !nthread_has_500ms_passed(0)) )
-				v7 = 0;
-			SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_NORMAL);
-			v5 = v7 == 0;
-		}
-		else
-		{
-			//_LOBYTE(v6) = nthread_has_500ms_passed();
-			v5 = nthread_has_500ms_passed(0) == 0;
-		}
-		if ( !v5 )
-		{
-			multi_process_network_packets();
-			game_loop(gbGameLoopStartup);
-			msgcmd_send_chat();
-			gbGameLoopStartup = 0;
-			DrawAndBlit();
-		}
-#ifdef SLEEP
-		Sleep(1);
-#endif
-	}
-	if ( (unsigned char)gbMaxPlayers > 1u )
-		pfile_write_hero();
-	pfile_flush_W();
-	PaletteFadeOut(8);
-	SetCursor_(0);
-	ClearScreenBuffer();
-	drawpanflag = 255;
-	scrollrt_draw_game_screen(1);
-	SetWindowProc(saveProc);
-	free_game();
-	if ( cineflag )
-	{
-		cineflag = 0;
-		DoEnding();
-	}
-}
-// 525650: using guessed type int gbRunGame;
-// 525698: using guessed type int gbRunGameResult;
-// 5256A0: using guessed type int gbProcessPlayers;
-// 525718: using guessed type char cineflag;
-// 52571C: using guessed type int drawpanflag;
-// 679660: using guessed type char gbMaxPlayers;
-
-void __fastcall start_game(unsigned int uMsg)
-{
-	DUMMY();
-	cineflag = 0;
-	zoomflag = 1;
-	InitCursor();
-	InitLightTable();
-	LoadDebugGFX();
-	music_stop();
-	ShowProgress(uMsg);
-    //gmenu_init_menu();  /*change removed*/
-	InitLevelCursor();
-	sgnTimeoutCurs = 0;
-	sgbMouseDown = 0;
-	track_repeat_walk(0);
-}
-// 52569C: using guessed type int zoomflag;
-// 525718: using guessed type char cineflag;
-// 525748: using guessed type char sgbMouseDown;
-
-void __cdecl free_game()
-{
-	DUMMY();
-	int i; // esi
-
-	FreeControlPan();
-	FreeInvGFX();
-	FreeGMenu();
-	FreeQuestText();
-	FreeStoreMem();
-
-	for(i = 0; i < MAX_PLRS; i++)
-		FreePlayerGFX(i);
-
-	FreeItemGFX();
-	FreeCursor();
-	FreeLightTable();
-	FreeDebugGFX();
-	FreeGameMem();
-}
-
-BOOL __cdecl diablo_get_not_running()
-{
-	SetLastError(0);
-	CreateEvent(NULL, FALSE, FALSE, "DiabloEvent");
-	return GetLastError() != ERROR_ALREADY_EXISTS;
-}
-
-int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
-{
-	HINSTANCE hInst;
-	int nData;
-	char szFileName[MAX_PATH];
-	BOOL bNoEvent;
-
-	hInst = hInstance;
-#ifndef DEBUGGER
-	diablo_reload_process(hInstance);
-#endif
-	ghInst = hInst;
-
-	if (RestrictedTest())
-		ErrOkDlg(IDD_DIALOG10, 0, "C:\\Src\\Diablo\\Source\\DIABLO.CPP", 877);
-	if (ReadOnlyTest()) {
-		if (!GetModuleFileName(ghInst, szFileName, sizeof(szFileName)))
-			szFileName[0] = '\0';
-		DirErrorDlg(szFileName);
-	}
-
-	ShowCursor(FALSE);
-	srand(GetTickCount());
-	InitHash();
-	exception_get_filter();
-
-	bNoEvent = diablo_get_not_running();
-	if (!diablo_find_window("DIABLO") && bNoEvent) {
-#ifdef _DEBUG
-		//SFileEnableDirectAccess(TRUE);
-#endif
-		diablo_init_screen();
-		diablo_parse_flags(lpCmdLine);
-		init_create_window(nCmdShow);
-		sound_init();
-		UiInitialize();
-
-#ifdef _DEBUG
-		if (showintrodebug)
-#endif
-			play_movie("gendata\\logo.smk", TRUE);
-
-		{
-			char szValueName[] = "Intro";
-			if (!SRegLoadValue("Diablo", szValueName, 0, &nData))
-				nData = 1;
-			if (nData)
-				play_movie("gendata\\diablo1.smk", TRUE);
-			SRegSaveValue("Diablo", szValueName, 0, 0);
-		}
-
-#ifdef _DEBUG
-		if (showintrodebug) {
-#endif
-			UiTitleDialog(7);
-			BlackPalette();
-#ifdef _DEBUG
-		}
-#endif
-
-		mainmenu_loop();
-		UiDestroy();
-		SaveGamma();
-
-		if (ghMainWnd) {
-			Sleep(300);
-			DestroyWindow(ghMainWnd);
-		}
-	}
-
-	return FALSE;
-}
-
-void __fastcall diablo_parse_flags(char *args)
-{
-	DUMMY();
-#ifdef _DEBUG
-	int n; // edi
-	int v15; // eax
-#endif
-	while ( *args )
-	{
-		for ( ; isspace(*args); ++args )
-			;
-		if ( !_strcmpi("dd_emulate", args) )
-		{
-			gbEmulate = 1;
-			args += strlen("dd_emulate");
-		}
-		else if ( !_strcmpi("dd_backbuf", args) )
-		{
-			gbBackBuf = 1;
-			args += strlen("dd_backbuf");
-		}
-		else if ( !_strcmpi("ds_noduplicates", args) )
-		{
-			gbDupSounds = 0;
-			args += strlen("ds_noduplicates");
-		}
-		else
-		{
-#ifdef _DEBUG
-			switch ( tolower(*args++) )
-			{
-				case '^': // god mod with all spells as skills
-					debug_mode_key_inverted_v = 1;
-					break;
-				case '$': // demi-god
-					debug_mode_dollar_sign = 1;
-					break;
-				/*case 'b': // enable drop log
-					debug_mode_key_b = 1;
-					break;*/
-				case 'd': // no startup video+???
-					showintrodebug = 0;
-					debug_mode_key_d = 1;
-					break;
-				case 'f': // draw fps
-					EnableFrameCount();
-					break;
-				case 'i': // disable network timeout
-					debug_mode_key_i = 1;
-					break;
-				/*case 'j': // <level>: init trigger at level
-					for ( ; isspace(*args); ++args )
-						;
-					for ( n = 0; isdigit(*args); n = v15 + 10 * n - 48 )
-						v15 = *args++;
-					debug_mode_key_J_trigger = n;
-					break;*/
-				case 'l': // <dtype> <level>: start in level as type
-					setlevel = 0;
-					for ( leveldebug = 1; isspace(*args); ++args )
-						;
-					for ( n = 0; isdigit(*args); n = v15 + 10 * n - 48 )
-						v15 = *args++;
-					for ( leveltype = n; isspace(*args); ++args )
-						;
-					for ( n = 0; isdigit(*args); n = v15 + 10 * n - 48 )
-						v15 = *args++;
-					currlevel = n;
-					plr[0].plrlevel = n;
-					break;
-				case 'm': // <mtype>: add debug monster, up to 10 allowed
-					for ( monstdebug = 1; isspace(*args); ++args )
-						;
-					for ( n = 0; isdigit(*args); n = v15 + 10 * n - 48 )
-						v15 = *args++;
-					DebugMonsters[debugmonsttypes++] = n;
-					break;
-				case 'n': // disable startup video
-					showintrodebug = 0;
-					break;
-				case 'q': // <qnum>: force a certain quest
-					for ( ; isspace(*args); ++args )
-						;
-					for ( n = 0; isdigit(*args); n = v15 + 10 * n - 48 )
-						v15 = *args++;
-					questdebug = n;
-					break;
-				case 'r': // <seed>: set map seed to
-					for ( ; isspace(*args); ++args )
-						;
-					for ( n = 0; isdigit(*args); n = v15 + 10 * n - 48 )
-						v15 = *args++;
-					setseed = n;
-					break;
-				case 's': // unused
-					debug_mode_key_s = 1;
-					break;
-				case 't': // <qlvl>: sets current quest level
-					leveldebug = 1;
-					for ( setlevel = 1; isspace(*args); ++args )
-						;
-					for ( n = 0; isdigit(*args); n = v15 + 10 * n - 48 )
-						v15 = *args++;
-					setlvlnum = n;
-					break;
-				case 'v': // draw yellow debug tiles
-					visiondebug = 1;
-					break;
-				case 'w': // rest of the cheats, some only in town
-					debug_mode_key_w = 1;
-					break;
-				case 'x':
-					fullscreen = 0;
-					break;
-				default:
-					break;
-			}
-#else
-			tolower(*args++);
-#endif
-		}
-	}
-}
-// 4A22D6: using guessed type char gbDupSounds;
-// 52A548: using guessed type char gbBackBuf;
-// 52A549: using guessed type char gbEmulate;
-
-void __cdecl diablo_init_screen()
-{
-	int v0; // ecx
-	int *v1; // eax
-
-	v0 = 0;
-	MouseX = 320;
-	MouseY = 240;
-	ScrollInfo._sdx = 0;
-	ScrollInfo._sdy = 0;
-	ScrollInfo._sxoff = 0;
-	ScrollInfo._syoff = 0;
-	ScrollInfo._sdir = 0;
-	v1 = screen_y_times_768;
-	do
-	{
-		*v1 = v0;
-		++v1;
-		v0 += 768;
-	}
-	while ( (signed int)v1 < (signed int)&screen_y_times_768[1024] );
-	ClrDiabloMsg();
-}
-// 69CEFC: using guessed type int scrollrt_cpp_init_value;
-
-BOOL __fastcall diablo_find_window(LPCSTR lpClassName)
-{
-	HWND result; // eax
-	HWND v2; // esi
-	HWND v3; // eax
-	HWND v4; // edi
-
-	result = FindWindow(lpClassName, 0);
-	v2 = result;
-	if ( !result )
-		return 0;
-
-	v3 = GetLastActivePopup(result);
-	if ( v3 )
-		v2 = v3;
-	v4 = GetTopWindow(v2);
-	if ( !v4 )
-		v4 = v2;
-	SetForegroundWindow(v2);
-	SetFocus(v4);
-	return 1;
-}
-
-void __fastcall diablo_reload_process(HMODULE hModule)
-{
-	char *i; // eax
-	DWORD dwSize; // esi
-	BOOL v3; // edi
-	_DWORD *v4; // eax
-	_DWORD *v5; // esi
-	HWND v6; // eax
-	char Name[276]; // [esp+Ch] [ebp-29Ch]
-	char Filename[260]; // [esp+120h] [ebp-188h]
-	STARTUPINFOA si; // [esp+224h] [ebp-84h]
-	SYSTEM_INFO sinf; // [esp+268h] [ebp-40h]
-	PROCESS_INFORMATION pi; // [esp+28Ch] [ebp-1Ch]
-	DWORD dwProcessId; // [esp+29Ch] [ebp-Ch]
-	HANDLE hMap; // [esp+2A0h] [ebp-8h]
-	HWND hWnd; // [esp+2A4h] [ebp-4h]
-
-	*Filename = 0; // FIXME: was empty_string
-	memset(Filename + 1, 0, sizeof(Filename) - 1);
-//	*(_WORD *)&Filename[257] = 0;
-//	Filename[259] = 0;
-	GetModuleFileName(hModule, Filename, 0x104u);
-	wsprintf(Name, "Reload-%s", Filename);
-	for ( i = Name; *i; ++i )
-	{
-		if ( *i == '\\' )
-			*i = '/';
-	}
-	GetSystemInfo(&sinf);
-	dwSize = sinf.dwPageSize;
-	if ( sinf.dwPageSize < 4096 )
-		dwSize = 4096;
-	hMap = CreateFileMapping((HANDLE)0xFFFFFFFF, NULL, SEC_COMMIT|PAGE_READWRITE, 0, dwSize, Name);
-	v3 = GetLastError() != ERROR_ALREADY_EXISTS;
-	if ( hMap )
-	{
-		v4 = (unsigned int *)MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS, 0, 0, dwSize);
-		v5 = v4;
-		if ( v4 )
-		{
-			if ( v3 )
-			{
-				*v4 = -1;
-				v4[1] = 0;
-				memset(&si, 0, sizeof(si));
-				si.cb = sizeof(si);
-				CreateProcess(Filename, NULL, NULL, NULL, FALSE, CREATE_NEW_PROCESS_GROUP, NULL, NULL, &si, &pi);
-				WaitForInputIdle(pi.hProcess, 0xFFFFFFFF);
-				CloseHandle(pi.hThread);
-				CloseHandle(pi.hProcess);
-				while ( *v5 < 0 )
-					Sleep(1000);
-				UnmapViewOfFile(v5);
-				CloseHandle(hMap);
-				ExitProcess(0);
-			}
-			if ( InterlockedIncrement((long *)v4) )
-			{
-				v6 = GetForegroundWindow();
-				do
-				{
-					hWnd = v6;
-					v6 = GetWindow(v6, 3u);
-				}
-				while ( v6 );
-				while ( 1 )
-				{
-					GetWindowThreadProcessId(hWnd, &dwProcessId);
-					if ( dwProcessId == v5[1] )
-						break;
-					hWnd = GetWindow(hWnd, 2u);
-					if ( !hWnd )
-						goto LABEL_23;
-				}
-				SetForegroundWindow(hWnd);
-LABEL_23:
-				UnmapViewOfFile(v5);
-				CloseHandle(hMap);
-				ExitProcess(0);
-			}
-			v5[1] = GetCurrentProcessId();
-		}
-	}
-}
-
-int __cdecl PressEscKey()
-{
-	int result; // eax
-
-	result = 0;
-	if ( doomflag )
-	{
-		doom_close();
-		result = 1;
-	}
-	if ( helpflag )
-	{
-		helpflag = 0;
-		result = 1;
-	}
-	if ( qtextflag )
-	{
-		qtextflag = 0;
-		sfx_stop();
-	}
-	else
-	{
-		if ( !stextflag )
-			goto LABEL_10;
-		STextESC();
-	}
-	result = 1;
-LABEL_10:
-	if ( msgflag )
-	{
-		msgdelay = 0;
-		result = 1;
-	}
-	if ( talkflag )
-	{
-		control_reset_talk();
-		result = 1;
-	}
-	if ( dropGoldFlag )
-	{
-		control_drop_gold(VK_ESCAPE);
-		result = 1;
-	}
-	if ( spselflag )
-	{
-		spselflag = 0;
-		result = 1;
-	}
-	return result;
-}
-// 4B84DC: using guessed type int dropGoldFlag;
-// 4B8960: using guessed type int talkflag;
-// 4B8C98: using guessed type int spselflag;
-// 52575C: using guessed type int doomflag;
-// 52B9F0: using guessed type char msgdelay;
-// 52B9F1: using guessed type char msgflag;
-// 646D00: using guessed type char qtextflag;
-// 6AA705: using guessed type char stextflag;
-
-LRESULT __stdcall DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	bool v5; // zf
-
-	if ( uMsg <= WM_LBUTTONDOWN )
-	{
-		if ( uMsg != WM_LBUTTONDOWN )
-		{
-			if ( uMsg >= WM_KEYFIRST
-			  && (uMsg <= WM_CHAR
-			   || uMsg == WM_SYSKEYDOWN
-			   || uMsg == WM_SYSCOMMAND
-			   || uMsg == WM_MOUSEFIRST) )
-			{
-				return 0;
-			}
-			return MainWndProc(hWnd, uMsg, wParam, lParam);
-		}
-		if ( !sgbMouseDown )
-		{
-			sgbMouseDown = 1;
-LABEL_21:
-			SetCapture(hWnd);
-			return 0;
-		}
-		return 0;
-	}
-	if ( uMsg == WM_LBUTTONUP )
-	{
-		v5 = sgbMouseDown == 1;
-		goto LABEL_23;
-	}
-	if ( uMsg != WM_RBUTTONDOWN )
-	{
-		if ( uMsg != WM_RBUTTONUP )
-		{
-			if ( uMsg == WM_CAPTURECHANGED )
-			{
-				if ( hWnd != (HWND)lParam )
-					sgbMouseDown = 0;
-				return 0;
-			}
-			return MainWndProc(hWnd, uMsg, wParam, lParam);
-		}
-		v5 = sgbMouseDown == 2;
-LABEL_23:
-		if ( v5 )
-		{
-			sgbMouseDown = 0;
-			ReleaseCapture();
-		}
-		return 0;
-	}
-	if ( !sgbMouseDown )
-	{
-		sgbMouseDown = 2;
-		goto LABEL_21;
-	}
-	return 0;
-}
-// 525748: using guessed type char sgbMouseDown;
-
-LRESULT __stdcall GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	if ( uMsg > WM_LBUTTONDOWN )
-	{
-		if ( uMsg == WM_LBUTTONUP )
-		{
-			MouseX = (unsigned short)lParam;
-			MouseY = (unsigned int)lParam >> 16;
-			if ( sgbMouseDown != 1 )
-				return 0;
-			sgbMouseDown = 0;
-			LeftMouseUp();
-			track_repeat_walk(0);
-		}
-		else
-		{
-			if ( uMsg == WM_RBUTTONDOWN )
-			{
-				MouseX = (unsigned short)lParam;
-				MouseY = (unsigned int)lParam >> 16;
-				if ( !sgbMouseDown )
-				{
-					sgbMouseDown = 2;
-					SetCapture(hWnd);
-					RightMouseDown();
-				}
-				return 0;
-			}
-			if ( uMsg != WM_RBUTTONUP )
-			{
-				if ( uMsg == WM_CAPTURECHANGED )
-				{
-					if ( hWnd != (HWND)lParam )
-					{
-						sgbMouseDown = 0;
-						track_repeat_walk(0);
-					}
-				}
-				else if ( uMsg > 0x401 && uMsg <= WM_DIABRETOWN ) // FIXME: 0x401
-				{
-					if ( (unsigned char)gbMaxPlayers > 1u )
-						pfile_write_hero();
-					nthread_ignore_mutex(1);
-					PaletteFadeOut(8);
-					FreeMonsterSnd();
-					music_stop();
-					track_repeat_walk(0);
-					sgbMouseDown = 0;
-					ReleaseCapture();
-					ShowProgress(uMsg);
-					drawpanflag = 255;
-					DrawAndBlit();
-					if ( gbRunGame )
-						PaletteFadeIn(8);
-					nthread_ignore_mutex(0);
-					gbGameLoopStartup = 1;
-					return 0;
-				}
-				return MainWndProc(hWnd, uMsg, wParam, lParam);
-			}
-			MouseX = (unsigned short)lParam;
-			MouseY = (unsigned int)lParam >> 16;
-			if ( sgbMouseDown != 2 )
-				return 0;
-			sgbMouseDown = 0;
-		}
-		ReleaseCapture();
-		return 0;
-	}
-	switch ( uMsg )
-	{
-		case WM_LBUTTONDOWN:
-			MouseX = (unsigned short)lParam;
-			MouseY = (unsigned int)lParam >> 16;
-			if ( !sgbMouseDown )
-			{
-				sgbMouseDown = 1;
-				SetCapture(hWnd);
-				track_repeat_walk(LeftMouseDown(wParam));
-			}
-			return 0;
-		case WM_KEYFIRST:
-			PressKey(wParam);
-			return 0;
-		case WM_KEYUP:
-			ReleaseKey(wParam);
-			return 0;
-		case WM_CHAR:
-			PressChar(wParam);
-			return 0;
-		case WM_SYSKEYDOWN:
-			if ( PressSysKey(wParam) )
-				return 0;
-			return MainWndProc(hWnd, uMsg, wParam, lParam);
-		case WM_SYSCOMMAND:
-			if ( wParam == SC_CLOSE )
-			{
-				gbRunGame = 0;
-				gbRunGameResult = 0;
-				return 0;
-			}
-			return MainWndProc(hWnd, uMsg, wParam, lParam);
-	}
-	if ( uMsg != WM_MOUSEFIRST )
-		return MainWndProc(hWnd, uMsg, wParam, lParam);
-	MouseX = (unsigned short)lParam;
-	MouseY = (unsigned int)lParam >> 16;
-	gmenu_on_mouse_move((unsigned short)lParam);
-	return 0;
-}
-// 525650: using guessed type int gbRunGame;
-// 525698: using guessed type int gbRunGameResult;
-// 52571C: using guessed type int drawpanflag;
-// 525748: using guessed type char sgbMouseDown;
-// 679660: using guessed type char gbMaxPlayers;
-
-BOOL __fastcall LeftMouseDown(int a1)
-{
-	int v1; // edi
-	int v3; // eax
-	bool v6; // zf
-	int v7; // ecx
-	int v8; // eax
-	unsigned char v9; // dl
-	unsigned char v11; // dl
-	unsigned short v12; // ax
-	unsigned char v13; // dl
-	unsigned short v15; // [esp-8h] [ebp-10h]
-
-	v1 = a1;
-
-const Uint8 *keystate = SDL_GetKeyboardState(NULL);
-
-if (keystate[SDL_SCANCODE_LSHIFT]) {
-	printf("LSHIFT PRESSED\n");
-		v1 = 5 ;
-	}
-
-
-
-
-
-	if ( gmenu_left_mouse(1) || control_check_talk_btn() || sgnTimeoutCurs )
-		return 0;
-	if ( deathflag )
-	{
-		control_check_btn_press();
-		return 0;
-	}
-	if ( PauseMode == 2 )
-		return 0;
-	if ( doomflag )
-	{
-		doom_close();
-		return 0;
-	}
-	if ( spselflag )
-	{
-		SetSpell();
-		return 0;
-	}
-	if ( stextflag )
-	{
-		CheckStoreBtn();
-		return 0;
-	}
-	if ( MouseY >= 352 )
-	{
-		if ( !talkflag && !dropGoldFlag )
-		{
-			if ( !gmenu_exception() )
-				CheckInvScrn();
-		}
-		DoPanBtn();
-		if ( pcurs <= 1 || pcurs >= 12 )
-			return 0;
-		goto LABEL_48;
-	}
-	if ( gmenu_exception() || TryIconCurs() )
-		return 0;
-	if ( questlog && MouseX > 32 && MouseX < 288 && MouseY > 32 && MouseY < 308 )
-	{
-		QuestlogESC();
-		return 0;
-	}
-	if ( qtextflag )
-	{
-		qtextflag = 0;
-		sfx_stop();
-		return 0;
-	}
-	if ( chrflag && MouseX < 320 )
-	{
-		CheckChrBtns();
-		return 0;
-	}
-	if ( invflag && MouseX > 320 )
-	{
-		if ( !dropGoldFlag )
-			CheckInvItem();
-		return 0;
-	}
-	if ( sbookflag && MouseX > 320 )
-	{
-		CheckSBook();
-		return 0;
-	}
-	if ( pcurs >= CURSOR_FIRSTITEM )
-	{
-		if ( !TryInvPut() )
-			return 0;
-		NetSendCmdPItem(1u, CMD_PUTITEM, cursmx, cursmy);
-LABEL_48:
-		SetCursor_(CURSOR_HAND);
-		return 0;
-	}
-	v3 = 21720 * myplr;
-	if ( plr[myplr]._pStatPts && !spselflag )
-		CheckLvlBtn();
-	if ( lvlbtndown )
-		return 0;
-	if ( leveltype != DTYPE_TOWN )
-	{
-		v7 = abs(plr[myplr].WorldX - cursmx) < 2 && abs(plr[myplr].WorldY - cursmy) < 2;
-		_HIWORD(v8) = _HIWORD(pcurs);
-		if ( pcursitem != -1 && pcurs == 1 && v1 != 5 )
-		{
-			_LOWORD(v8) = pcursitem;
-			NetSendCmdLocParam1(1u, (invflag == 0) + CMD_GOTOGETITEM, cursmx, cursmy, v8);
-LABEL_96:
-			if ( pcursitem != -1 )
-				return 0;
-			v6 = pcursobj == -1;
-			goto LABEL_98;
-		}
-		if ( pcursobj != -1 )
-		{
-			if ( v1 != 5 || v7 && object[pcursobj]._oBreak == 1 )
-			{
-				NetSendCmdLocParam1(1u, (pcurs == 5) + CMD_OPOBJXY, cursmx, cursmy, pcursobj);
-				goto LABEL_95;
-			}
-		}
-		if ( plr[myplr]._pwtype == 1 )
-		{
-			if ( v1 == 5 )
-			{
-				v9 = CMD_RATTACKXY;
-LABEL_84:
-				NetSendCmdLoc(1u, v9, cursmx, cursmy);
-				goto LABEL_95;
-			}
-			if ( pcursmonst != -1 )
-			{
-				v15 = pcursmonst;
-				if ( !CanTalkToMonst(pcursmonst) )
-				{
-					v11 = CMD_RATTACKID;
-LABEL_89:
-					NetSendCmdParam1(1u, v11, v15);
-					goto LABEL_96;
-				}
-LABEL_88:
-				v11 = CMD_ATTACKID;
-				goto LABEL_89;
-			}
-			_LOBYTE(v12) = pcursplr;
-			if ( pcursplr == -1 || FriendlyMode )
-				goto LABEL_96;
-			v13 = CMD_RATTACKPID;
-		}
-		else
-		{
-			if ( v1 == 5 )
-			{
-				if ( pcursmonst == -1 || !CanTalkToMonst(pcursmonst) )
-				{
-					v9 = CMD_SATTACKXY;
-					goto LABEL_84;
-				}
-				v12 = pcursmonst;
-				v13 = CMD_ATTACKID;
-LABEL_94:
-				NetSendCmdParam1(1u, v13, v12);
-LABEL_95:
-				if ( v1 == 5 )
-					return 0;
-				goto LABEL_96;
-			}
-			if ( pcursmonst != -1 )
-			{
-				v15 = pcursmonst;
-				goto LABEL_88;
-			}
-			_LOBYTE(v12) = pcursplr;
-			if ( pcursplr == -1 || FriendlyMode )
-				goto LABEL_96;
-			v13 = CMD_ATTACKPID;
-		}
-		v12 = (char)v12;
-		goto LABEL_94;
-	}
-	if ( pcursitem != -1 && pcurs == 1 )
-	{
-		_LOWORD(v3) = pcursitem;
-		NetSendCmdLocParam1(1u, (invflag == 0) + CMD_GOTOGETITEM, cursmx, cursmy, v3);
-	}
-	if ( pcursmonst != -1 )
-		NetSendCmdLocParam1(1u, CMD_TALKXY, cursmx, cursmy, pcursmonst);
-	v6 = pcursitem == -1;
-LABEL_98:
-	if ( v6 && pcursmonst == -1 && pcursplr == -1 )
-		return 1;
-	return 0;
-}
-// 484368: using guessed type int FriendlyMode;
-// 4B84DC: using guessed type int dropGoldFlag;
-// 4B851C: using guessed type int lvlbtndown;
-// 4B8960: using guessed type int talkflag;
-// 4B8968: using guessed type int sbookflag;
-// 4B8C98: using guessed type int spselflag;
-// 4B8CC0: using guessed type char pcursitem;
-// 4B8CC1: using guessed type char pcursobj;
-// 4B8CC2: using guessed type char pcursplr;
-// 525740: using guessed type int PauseMode;
-// 52575C: using guessed type int doomflag;
-// 5BB1ED: using guessed type char leveltype;
-// 646D00: using guessed type char qtextflag;
-// 69BD04: using guessed type int questlog;
-// 6AA705: using guessed type char stextflag;
-
-BOOLEAN __cdecl TryIconCurs()
-{
-	unsigned char v0; // dl
-	int v1; // edx
-	int v2; // eax
-	int v3; // eax
-	int v4; // ST0C_4
-	int v5; // eax
-
-	switch ( pcurs )
-	{
-		case CURSOR_RESURRECT:
-			v0 = CMD_RESURRECT;
-LABEL_3:
-			NetSendCmdParam1(1u, v0, pcursplr);
-			return 1;
-		case CURSOR_HEALOTHER:
-			v0 = CMD_HEALOTHER;
-			goto LABEL_3;
-		case CURSOR_TELEKINESIS:
-			DoTelekinesis();
-			return 1;
-		case CURSOR_IDENTIFY:
-			if ( pcursinvitem != -1 )
-			{
-				CheckIdentify(myplr, pcursinvitem);
-				return 1;
-			}
-LABEL_26:
-			SetCursor_(CURSOR_HAND);
-			return 1;
-		case CURSOR_REPAIR:
-			if ( pcursinvitem != -1 )
-			{
-				DoRepair(myplr, pcursinvitem);
-				return 1;
-			}
-			goto LABEL_26;
-		case CURSOR_RECHARGE:
-			if ( pcursinvitem != -1 )
-			{
-				DoRecharge(myplr, pcursinvitem);
-				return 1;
-			}
-			goto LABEL_26;
-		case CURSOR_TELEPORT:
-			v1 = plr[myplr]._pTSpell;
-			if ( pcursmonst == -1 )
-			{
-				if ( pcursplr == -1 )
-				{
-					v4 = GetSpellLevel(myplr, v1);
-					v5 = 21720 * myplr;
-					_LOWORD(v5) = plr[myplr]._pTSpell;
-					NetSendCmdLocParam2(1u, CMD_TSPELLXY, cursmx, cursmy, v5, v4);
-				}
-				else
-				{
-					v3 = GetSpellLevel(myplr, v1);
-					NetSendCmdParam3(1u, CMD_TSPELLPID, pcursplr, plr[myplr]._pTSpell, v3);
-				}
-			}
-			else
-			{
-				v2 = GetSpellLevel(myplr, v1);
-				NetSendCmdParam3(1u, CMD_TSPELLID, pcursmonst, plr[myplr]._pTSpell, v2);
-			}
-			goto LABEL_26;
-	}
-	if ( pcurs == CURSOR_DISARM && pcursobj == -1 )
-		goto LABEL_26;
-	return 0;
-}
-// 4B8CB8: using guessed type char pcursinvitem;
-// 4B8CC1: using guessed type char pcursobj;
-// 4B8CC2: using guessed type char pcursplr;
-
-void __cdecl LeftMouseUp()
-{
-	gmenu_left_mouse(0);
-	control_release_talk_btn();
-	if ( panbtndown )
-		CheckBtnUp();
-	if ( chrbtnactive )
-		ReleaseChrBtns();
-	if ( lvlbtndown )
-		ReleaseLvlBtn();
-	if ( stextflag )
-		ReleaseStoreBtn();
-}
-// 4B851C: using guessed type int lvlbtndown;
-// 4B87A8: using guessed type int chrbtnactive;
-// 4B8C90: using guessed type int panbtndown;
-// 6AA705: using guessed type char stextflag;
-
-void __cdecl RightMouseDown()
-{
-	if ( !gmenu_exception() && sgnTimeoutCurs == CURSOR_NONE && PauseMode != 2 && !plr[myplr]._pInvincible )
-	{
-		if ( doomflag )
-		{
-			doom_close();
-		}
-		else if ( !stextflag )
-		{
-			if ( spselflag )
-			{
-				SetSpell();
-			}
-			else if ( MouseY >= 352
-				   || (!sbookflag || MouseX <= 320)
-				   && !TryIconCurs()
-				   && (pcursinvitem == -1 || !UseInvItem(myplr, pcursinvitem)) )
-			{
-				if ( pcurs == 1 )
-				{
-					if ( pcursinvitem == -1 || !UseInvItem(myplr, pcursinvitem) )
-						CheckPlrSpell();
-				}
-				else if ( pcurs > 1 && pcurs < 12 )
-				{
-					SetCursor_(CURSOR_HAND);
-				}
-			}
-		}
-	}
-}
-// 4B8968: using guessed type int sbookflag;
-// 4B8C98: using guessed type int spselflag;
-// 4B8CB8: using guessed type char pcursinvitem;
-// 525740: using guessed type int PauseMode;
-// 52575C: using guessed type int doomflag;
-// 6AA705: using guessed type char stextflag;
-
-BOOL __fastcall PressSysKey(int wParam)
-{
-	if ( gmenu_exception() || wParam != VK_F10 )
-		return 0;
-	diablo_hotkey_msg(1);
-	return 1;
-}
-
-void __fastcall diablo_hotkey_msg(int dwMsg)
-{
-	int v1; // esi
-	char *v2; // eax
-	char Filename[260]; // [esp+4h] [ebp-154h]
-	char ReturnedString[80]; // [esp+108h] [ebp-50h]
-
-	v1 = dwMsg;
-	if ( gbMaxPlayers != 1 )
-	{
-		if ( !GetModuleFileName(ghInst, Filename, 0x104u) )
-			TermMsg("Can't get program name");
-		v2 = strrchr(Filename, '\\');
-		if ( v2 )
-			*v2 = 0;
-		strcat(Filename, "\\Diablo.ini");
-		GetPrivateProfileString("NetMsg", spszMsgKeyTbl[v1], spszMsgTbl[v1], ReturnedString, 0x50u, Filename);
-		NetSendCmdString(-1, ReturnedString);
-	}
-}
-// 48436C: using guessed type char *spszMsgTbl[4];
-// 48437C: using guessed type char *spszMsgKeyTbl[4];
-// 679660: using guessed type char gbMaxPlayers;
-
-void __fastcall ReleaseKey(int vkey)
-{
-	if ( vkey == VK_SNAPSHOT )
-		CaptureScreen();
-}
-
-void __fastcall PressKey(int vkey)
-{
-	int v1; // esi
-	int v2; // ecx
-	int v3; // ecx
-	signed int v4; // eax
-
-	v1 = vkey;
-	if ( !gmenu_presskeys(vkey) && !control_presskeys(v1) )
-	{
-		if ( !deathflag )
-			goto LABEL_113;
-		if ( sgnTimeoutCurs == CURSOR_NONE )
-		{
-			if ( v1 == VK_F9 )
-				diablo_hotkey_msg(0);
-			if ( v1 == VK_F10 )
-				diablo_hotkey_msg(1);
-			if ( v1 == VK_F11 )
-				diablo_hotkey_msg(2);
-			if ( v1 == VK_F12 )
-				diablo_hotkey_msg(3);
-			if ( v1 == VK_RETURN )
-				control_type_message();
-			if ( v1 == VK_ESCAPE )
-			{
-LABEL_113:
-				if ( v1 == VK_ESCAPE )
-				{
-					if ( !PressEscKey() )
-					{
-						track_repeat_walk(0);
-						gamemenu_previous();
-					}
-					return;
-				}
-				if ( sgnTimeoutCurs == CURSOR_NONE && !dropGoldFlag )
-				{
-					if ( v1 == VK_PAUSE )
-					{
-						diablo_pause_game();
-						return;
-					}
-					if ( PauseMode != 2 )
-					{
-						switch ( v1 )
-						{
-							case VK_RETURN:
-								if ( stextflag )
-								{
-									STextEnter();
-								}
-								else if ( questlog )
-								{
-									QuestlogEnter();
-								}
-								else
-								{
-									control_type_message();
-								}
-								return;
-							case VK_F1:
-								if ( helpflag )
-								{
-									helpflag = 0;
-									return;
-								}
-								if ( stextflag )
-								{
-									ClearPanel();
-									AddPanelString("No help available", 1);
-									AddPanelString("while in stores", 1);
-									track_repeat_walk(0);
-									return;
-								}
-								invflag = 0;
-								chrflag = 0;
-								sbookflag = 0;
-								spselflag = 0;
-								if ( qtextflag && leveltype == DTYPE_TOWN)
-								{
-									qtextflag = 0;
-									sfx_stop();
-								}
-								questlog = 0;
-								automapflag = 0;
-								msgdelay = 0;
-								gamemenu_off();
-								DisplayHelp();
-LABEL_110:
-								doom_close();
-								return;
-#ifdef _DEBUG
-							case VK_F3:
-								if ( pcursitem != -1 )
-								{
-									sprintf(tempstr, "IDX = %i  :  Seed = %i  :  CF = %i", item[pcursitem].IDidx, item[pcursitem]._iSeed, item[pcursitem]._iCreateInfo);
-									NetSendCmdString(1 << myplr, tempstr);
-								}
-								sprintf(tempstr, "Numitems : %i", numitems);
-								NetSendCmdString(1 << myplr, tempstr);
-								return;
-							case VK_F4:
-								PrintDebugQuest();
-								return;
-#endif
-							case VK_F5:
-								v2 = 0;
-								goto LABEL_48;
-							case VK_F6:
-								v2 = 1;
-								goto LABEL_48;
-							case VK_F7:
-								v2 = 2;
-								goto LABEL_48;
-							case VK_F8:
-								v2 = 3;
-LABEL_48:
-								if ( spselflag )
-									SetSpeedSpell(v2);
-								else
-									ToggleSpell(v2);
-								return;
-							case VK_F9:
-								v3 = 0;
-LABEL_59:
-								diablo_hotkey_msg(v3);
-								return;
-							case VK_F10:
-								v3 = 1;
-								goto LABEL_59;
-							case VK_F11:
-								v3 = 2;
-								goto LABEL_59;
-							case VK_F12:
-								v3 = 3;
-								goto LABEL_59;
-							case VK_UP:
-								if ( stextflag )
-								{
-									STextUp();
-								}
-								else if ( questlog )
-								{
-									QuestlogUp();
-								}
-								else if ( helpflag )
-								{
-									HelpScrollUp();
-								}
-								else if ( automapflag )
-								{
-									AutomapUp();
-								}
-								return;
-							case VK_DOWN:
-								if ( stextflag )
-								{
-									STextDown();
-								}
-								else if ( questlog )
-								{
-									QuestlogDown();
-								}
-								else if ( helpflag )
-								{
-									HelpScrollDown();
-								}
-								else if ( automapflag )
-								{
-									AutomapDown();
-								}
-								return;
-							case VK_PRIOR:
-								if ( stextflag )
-									STextPrior();
-								return;
-							case VK_NEXT:
-								if ( stextflag )
-									STextNext();
-								return;
-							case VK_LEFT:
-								if ( automapflag && !talkflag )
-									AutomapLeft();
-								return;
-							case VK_RIGHT:
-								if ( automapflag && !talkflag )
-									AutomapRight();
-								return;
-							case VK_TAB:
-								DoAutoMap();
-								return;
-							case VK_SPACE:
-								if ( !chrflag )
-								{
-									if ( !invflag )
-									{
-LABEL_106:
-										helpflag = 0;
-										invflag = 0;
-										chrflag = 0;
-										sbookflag = 0;
-										spselflag = 0;
-										if ( qtextflag && leveltype == DTYPE_TOWN )
-										{
-											qtextflag = 0;
-											sfx_stop();
-										}
-										questlog = 0;
-										automapflag = 0;
-										msgdelay = 0;
-										gamemenu_off();
-										goto LABEL_110;
-									}
-									v4 = MouseX;
-									if ( MouseX >= 480 || MouseY >= 352 )
-									{
-LABEL_101:
-										if ( !invflag && chrflag && v4 > 160 && MouseY < 352 )
-											SetCursorPos(v4 - 160, MouseY);
-										goto LABEL_106;
-									}
-									SetCursorPos(MouseX + 160, MouseY);
-								}
-								v4 = MouseX;
-								goto LABEL_101;
-						}
-					}
-				}
-			}
-		}
-	}
-}
-// 4B84DC: using guessed type int dropGoldFlag;
-// 4B8960: using guessed type int talkflag;
-// 4B8968: using guessed type int sbookflag;
-// 4B8C98: using guessed type int spselflag;
-// 525740: using guessed type int PauseMode;
-// 52B9F0: using guessed type char msgdelay;
-// 5BB1ED: using guessed type char leveltype;
-// 646D00: using guessed type char qtextflag;
-// 69BD04: using guessed type int questlog;
-// 6AA705: using guessed type char stextflag;
-
-void __cdecl diablo_pause_game()
-{
-	if ( (unsigned char)gbMaxPlayers <= 1u )
-	{
-		if ( PauseMode )
-		{
-			PauseMode = 0;
-		}
-		else
-		{
-			PauseMode = 2;
-			FreeMonsterSnd();
-			track_repeat_walk(0);
-		}
-		drawpanflag = 255;
-	}
-}
-// 52571C: using guessed type int drawpanflag;
-// 525740: using guessed type int PauseMode;
-// 679660: using guessed type char gbMaxPlayers;
-
-void __fastcall PressChar(int vkey)
-{
-	int v1; // ebx
-	BOOL v4; // ecx
-	int v5; // ecx
-	int v6; // eax
-	BOOL v7; // ecx
-	int v9; // ecx
-	int v10; // eax
-	int v11; // eax
-	int v12; // eax
-	int v13; // eax
-	int v14; // eax
-	int v15; // eax
-	int v16; // eax
-	int v18; // [esp-4h] [ebp-8h]
-
-	v1 = vkey;
-	if ( !gmenu_exception() && !control_talk_last_key(v1) && sgnTimeoutCurs == CURSOR_NONE && !deathflag )
-	{
-		if ( (_BYTE)v1 == 'p' || (_BYTE)v1 == 'P' )
-		{
-			diablo_pause_game();
-		}
-		else if ( PauseMode != 2 )
-		{
-			if ( doomflag )
-			{
-				doom_close();
-				return;
-			}
-			if ( dropGoldFlag )
-			{
-				control_drop_gold(v1);
-				return;
-			}
-			switch ( v1 )
-			{
-				case '!':
-				case '1':
-					v9 = myplr;
-					v10 = plr[myplr].SpdList[0]._itype;
-					if ( v10 != -1 && v10 != 11 )
-					{
-						v18 = 47;
-						goto LABEL_72;
-					}
-					return;
-				case '#':
-				case '3':
-					v9 = myplr;
-					v12 = plr[myplr].SpdList[2]._itype;
-					if ( v12 != -1 && v12 != 11 )
-					{
-						v18 = 49;
-						goto LABEL_72;
-					}
-					return;
-				case '$':
-				case '4':
-					v9 = myplr;
-					v13 = plr[myplr].SpdList[3]._itype;
-					if ( v13 != -1 && v13 != 11 )
-					{
-						v18 = 50;
-						goto LABEL_72;
-					}
-					return;
-				case '%':
-				case '5':
-					v9 = myplr;
-					v14 = plr[myplr].SpdList[4]._itype;
-					if ( v14 != -1 && v14 != 11 )
-					{
-						v18 = 51;
-						goto LABEL_72;
-					}
-					return;
-				case '&':
-				case '7':
-					v9 = myplr;
-					v16 = plr[myplr].SpdList[6]._itype;
-					if ( v16 != -1 && v16 != 11 )
-					{
-						v18 = 53;
-						goto LABEL_72;
-					}
-					return;
-				case '*':
-				case '8':
-#ifdef _DEBUG
-					if ( debug_mode_key_inverted_v || debug_mode_key_w )
-					{
-						NetSendCmd(1, CMD_CHEAT_EXPERIENCE);
-						return;
-					}
-#endif
-					v9 = myplr;
-					if ( plr[myplr].SpdList[7]._itype != -1
-					  && plr[myplr].SpdList[7]._itype != 11 )
-					{
-						v18 = 54;
-						goto LABEL_72;
-					}
-					return;
-				case '+':
-				case '=':
-					if ( automapflag )
-						AutomapZoomIn();
-					return;
-				case '-':
-				case '_':
-					if ( automapflag )
-						AutomapZoomOut();
-					return;
-				case '2':
-				case '@':
-					v9 = myplr;
-					v11 = plr[myplr].SpdList[1]._itype;
-					if ( v11 != -1 && v11 != 11 )
-					{
-						v18 = 48;
-						goto LABEL_72;
-					}
-					return;
-				case '6':
-				case '^':
-					v9 = myplr;
-					v15 = plr[myplr].SpdList[5]._itype;
-					if ( v15 != -1 && v15 != 11 )
-					{
-						v18 = 52;
-LABEL_72:
-						UseInvItem(v9, v18);
-					}
-					return;
-				case 'B':
-				case 'b':
-					if ( !stextflag )
-					{
-						invflag = 0;
-						sbookflag = sbookflag == 0;
-					}
-					return;
-				case 'C':
-				case 'c':
-					if ( !stextflag )
-					{
-						questlog = 0;
-						v7 = chrflag == 0;
-						chrflag = chrflag == 0;
-						if ( !v7 || invflag )
-							goto LABEL_18;
-						goto LABEL_24;
-					}
-					return;
-				case 'F':
-				case 'f':
-					IncreaseGamma();
-					return;
-				case 'G':
-				case 'g':
-					DecreaseGamma();
-					return;
-				case 'I':
-				case 'i':
-					if ( stextflag )
-						return;
-					sbookflag = 0;
-					v4 = invflag == 0;
-					invflag = invflag == 0;
-					if ( !v4 || chrflag )
-					{
-LABEL_24:
-						if ( MouseX < 480 )
-						{
-							v5 = MouseY;
-							if ( MouseY < 352 )
-							{
-								v6 = MouseX + 160;
-								goto LABEL_27;
-							}
-						}
-					}
-					else
-					{
-LABEL_18:
-						if ( MouseX > 160 )
-						{
-							v5 = MouseY;
-							if ( MouseY < 352 )
-							{
-								v6 = MouseX - 160;
-LABEL_27:
-								SetCursorPos(v6, v5);
-								return;
-							}
-						}
-					}
-					break;
-				case 'Q':
-				case 'q':
-					if ( !stextflag )
-					{
-						chrflag = 0;
-						if ( questlog )
-							questlog = 0;
-						else
-							StartQuestlog();
-					}
-					return;
-				case 'S':
-				case 's':
-					if ( !stextflag )
-					{
-						invflag = 0;
-						if ( spselflag )
-							spselflag = 0;
-						else
-							DoSpeedBook();
-						track_repeat_walk(0);
-					}
-					return;
-				case 'V':
-					NetSendCmdString(1 << myplr, gszVersionNumber);
-					return;
-				case 'v':
-					NetSendCmdString(1 << myplr, gszProductName);
-					return;
-				case 'Z':
-				case 'z':
-					zoomflag = zoomflag == 0;
-					return;
-#ifdef _DEBUG
-				case ')':
-				case '0':
-					if ( debug_mode_key_inverted_v )
-					{
-						if ( arrowdebug > 2 )
-							arrowdebug = 0;
-						if ( !arrowdebug )
-						{
-							plr[myplr]._pIFlags &= ~ISPL_FIRE_ARROWS;
-							plr[myplr]._pIFlags &= ~ISPL_LIGHT_ARROWS;
-						}
-						if ( arrowdebug == 1 )
-							plr[myplr]._pIFlags |= ISPL_FIRE_ARROWS;
-						if ( arrowdebug == 2 )
-							plr[myplr]._pIFlags |= ISPL_LIGHT_ARROWS;
-						arrowdebug++;
-					}
-					return;
-				case ':':
-					if ( !currlevel && debug_mode_key_w )
-						SetAllSpellsCheat();
-					return;
-				case '[':
-					if ( !currlevel && debug_mode_key_w )
-						TakeGoldCheat();
-					return;
-				case ']':
-					if ( !currlevel && debug_mode_key_w )
-						MaxSpellsCheat();
-					return;
-				case 'a':
-					if ( debug_mode_key_inverted_v )
-					{
-						spelldata[SPL_TELEPORT].sTownSpell = TRUE;
-						plr[myplr]._pSplLvl[plr[myplr]._pSpell]++;
-					}
-					return;
-				case 'D':
-					PrintDebugPlayer(1);
-					return;
-				case 'd':
-					PrintDebugPlayer(0);
-					return;
-				case 'e':
-					if ( debug_mode_key_d )
-					{
-						sprintf(tempstr, "EFlag = %i", plr[myplr]._peflag);
-						NetSendCmdString(1 << myplr, tempstr);
-					}
-					return;
-				case 'L':
-				case 'l':
-					if ( debug_mode_key_inverted_v )
-						ToggleLighting();
-					return;
-				case 'M':
-					NextDebugMonster();
-					return;
-				case 'm':
-					GetDebugMonster();
-					return;
-				case 'R':
-				case 'r':
-					sprintf(tempstr, "seed = %i", glSeedTbl[currlevel]);
-					NetSendCmdString(1 << myplr, tempstr);
-					sprintf(tempstr, "Mid1 = %i : Mid2 = %i : Mid3 = %i", glMid1Seed[currlevel], glMid2Seed[currlevel], glMid3Seed[currlevel]);
-					NetSendCmdString(1 << myplr, tempstr);
-					sprintf(tempstr, "End = %i", glEndSeed[currlevel]);
-					NetSendCmdString(1 << myplr, tempstr);
-					return;
-				case 'T':
-				case 't':
-					if ( debug_mode_key_inverted_v )
-					{
-						sprintf(tempstr, "PX = %i  PY = %i", plr[myplr].WorldX, plr[myplr].WorldY);
-						NetSendCmdString(1 << myplr, tempstr);
-						sprintf(tempstr, "CX = %i  CY = %i  DP = %i", cursmx, cursmy, dungeon[cursmx][cursmy]);
-						NetSendCmdString(1 << myplr, tempstr);
-					}
-					return;
-				case '|':
-					if ( !currlevel && debug_mode_key_w )
-						GiveGoldCheat();
-					return;
-				case '~':
-					if ( !currlevel && debug_mode_key_w )
-						StoresCheat();
-					return;
-#endif
-				default:
-					return;
-			}
-		}
-	}
-}
-// 4B84DC: using guessed type int dropGoldFlag;
-// 4B8968: using guessed type int sbookflag;
-// 4B8C98: using guessed type int spselflag;
-// 52569C: using guessed type int zoomflag;
-// 525740: using guessed type int PauseMode;
-// 52575C: using guessed type int doomflag;
-// 69BD04: using guessed type int questlog;
-// 6AA705: using guessed type char stextflag;
-
-void __cdecl LoadLvlGFX()
-{
-	switch(leveltype)
-	{
-		case DTYPE_TOWN:
-			pDungeonCels = LoadFileInMem("Levels\\TownData\\Town.CEL", 0);
-			pMegaTiles = LoadFileInMem("Levels\\TownData\\Town.TIL", 0);
-			pLevelPieces = LoadFileInMem("Levels\\TownData\\Town.MIN", 0);
-			level_special_cel = LoadFileInMem("Levels\\TownData\\TownS.CEL", 0);
-			break;
-		case DTYPE_CATHEDRAL:
-			pDungeonCels = LoadFileInMem("Levels\\L1Data\\L1.CEL", 0);
-			pMegaTiles = LoadFileInMem("Levels\\L1Data\\L1.TIL", 0);
-			pLevelPieces = LoadFileInMem("Levels\\L1Data\\L1.MIN", 0);
-			level_special_cel = LoadFileInMem("Levels\\L1Data\\L1S.CEL", 0);
-			break;
-		case DTYPE_CATACOMBS:
-			pDungeonCels = LoadFileInMem("Levels\\L2Data\\L2.CEL", 0);
-			pMegaTiles = LoadFileInMem("Levels\\L2Data\\L2.TIL", 0);
-			pLevelPieces = LoadFileInMem("Levels\\L2Data\\L2.MIN", 0);
-			level_special_cel = LoadFileInMem("Levels\\L2Data\\L2S.CEL", 0);
-			break;
-		case DTYPE_CAVES:
-			pDungeonCels = LoadFileInMem("Levels\\L3Data\\L3.CEL", 0);
-			pMegaTiles = LoadFileInMem("Levels\\L3Data\\L3.TIL", 0);
-			pLevelPieces = LoadFileInMem("Levels\\L3Data\\L3.MIN", 0);
-			level_special_cel = LoadFileInMem("Levels\\L1Data\\L1S.CEL", 0);
-			break;
-		case DTYPE_HELL:
-			pDungeonCels = LoadFileInMem("Levels\\L4Data\\L4.CEL", 0);
-			pMegaTiles = LoadFileInMem("Levels\\L4Data\\L4.TIL", 0);
-			pLevelPieces = LoadFileInMem("Levels\\L4Data\\L4.MIN", 0);
-			level_special_cel = LoadFileInMem("Levels\\L2Data\\L2S.CEL", 0);
-			break;
-		default:
-			TermMsg("LoadLvlGFX");
-			return;
-	}
-}
-// 5BB1ED: using guessed type char leveltype;
-
-void __cdecl LoadAllGFX()
-{
-	pSpeedCels = DiabloAllocPtr(0x100000);
-	IncProgress();
-	IncProgress();
-	InitObjectGFX();
-	IncProgress();
-	InitMissileGFX();
-	IncProgress();
-}
-
-void __fastcall CreateLevel(int lvldir)
-{
-	int hnd; // cl
-
-	switch ( leveltype )
-	{
-		case DTYPE_TOWN:
-			CreateTown(lvldir);
-			InitTownTriggers();
-			hnd = 0;
-			break;
-		case DTYPE_CATHEDRAL:
-			CreateL5Dungeon(glSeedTbl[currlevel], lvldir);
-			InitL1Triggers();
-			Freeupstairs();
-			hnd = 1;
-			break;
-		case DTYPE_CATACOMBS:
-			CreateL2Dungeon(glSeedTbl[currlevel], lvldir);
-			InitL2Triggers();
-			Freeupstairs();
-			hnd = 2;
-			break;
-		case DTYPE_CAVES:
-			CreateL3Dungeon(glSeedTbl[currlevel], lvldir);
-			InitL3Triggers();
-			Freeupstairs();
-			hnd = 3;
-			break;
-		case DTYPE_HELL:
-			CreateL4Dungeon(glSeedTbl[currlevel], lvldir);
-			InitL4Triggers();
-			Freeupstairs();
-			hnd = 4;
-			break;
-		default:
-			TermMsg("CreateLevel");
-			return;
-	}
-
-	LoadRndLvlPal(hnd);
-}
-// 5BB1ED: using guessed type char leveltype;
-
-void __fastcall LoadGameLevel(BOOL firstflag, int lvldir)
-{
-	int v2; // ebp
-	bool visited; // edx
-	int i; // ecx
-	int j; // eax
-
-	v2 = 0;
-	if ( setseed )
-		glSeedTbl[currlevel] = setseed;
-	music_stop();
-	SetCursor_(CURSOR_HAND);
-	SetRndSeed(glSeedTbl[currlevel]);
-	IncProgress();
-	MakeLightTable();
-	LoadLvlGFX();
-	IncProgress();
-	if ( firstflag )
-	{
-		InitInv();
-		InitItemGFX();
-		InitQuestText();
-
-		if ( gbMaxPlayers )
-		{
-			for(i = 0; i < gbMaxPlayers; i++)
-				InitPlrGFXMem(i);
-		}
-
-		InitStores();
-		InitAutomapOnce();
-		InitHelp();
-	}
-	SetRndSeed(glSeedTbl[currlevel]);
-	if ( leveltype == DTYPE_TOWN)
-		SetupTownStores();
-	IncProgress();
-	InitAutomap();
-	if ( leveltype != DTYPE_TOWN && lvldir != 4 )
-	{
-		InitLighting();
-		InitVision();
-	}
-	InitLevelMonsters();
-	IncProgress();
-	if ( !setlevel )
-	{
-		CreateLevel(lvldir);
-		IncProgress();
-		FillSolidBlockTbls();
-		SetRndSeed(glSeedTbl[currlevel]);
-		if ( leveltype != DTYPE_TOWN )
-		{
-			GetLevelMTypes();
-			InitThemes();
-			LoadAllGFX();
-		}
-		else
-		{
-			InitMissileGFX();
-		}
-		IncProgress();
-		if ( lvldir == 3 )
-			GetReturnLvlPos();
-		if ( lvldir == 5 )
-			GetPortalLvlPos();
-		IncProgress();
-
-		for(i = 0; i < MAX_PLRS; i++)
-		{
-			if ( plr[i].plractive )
-			{
-				if ( currlevel == plr[i].plrlevel )
-				{
-					InitPlayerGFX(v2);
-					if ( lvldir != 4 )
-						InitPlayer(v2, firstflag);
-				}
-			}
-			++v2;
-		}
-
-		PlayDungMsgs();
-		InitMultiView();
-		IncProgress();
-
-		visited = 0;
-		if ( gbMaxPlayers > 0 )
-		{
-			for(i = 0; i < gbMaxPlayers; i++)
-			{
-				if ( plr[i].plractive )
-					visited = visited || plr[i]._pLvlVisited[currlevel];
-			}
-		}
-		SetRndSeed(glSeedTbl[currlevel]);
-		if ( leveltype != DTYPE_TOWN)
-		{
-			if ( firstflag || lvldir == 4 || !plr[myplr]._pLvlVisited[currlevel] || gbMaxPlayers != 1 )
-			{
-				HoldThemeRooms();
-				glMid1Seed[currlevel] = GetRndSeed();
-				InitMonsters();
-				glMid2Seed[currlevel] = GetRndSeed();
-				InitObjects();
-				InitItems();
-				CreateThemeRooms();
-				glMid3Seed[currlevel] = GetRndSeed();
-				InitMissiles();
-				InitDead();
-				glEndSeed[currlevel] = GetRndSeed();
-				if ( gbMaxPlayers != 1 )
-					DeltaLoadLevel();
-				IncProgress();
-				SavePreLighting();
-				goto LABEL_55;
-			}
-			InitMonsters();
-			InitMissiles();
-			InitDead();
-			IncProgress();
-			LoadLevel();
-LABEL_54:
-			IncProgress();
-LABEL_55:
-			if ( gbMaxPlayers == 1 )
-				ResyncQuests();
-			else
-				ResyncMPQuests();
-			goto LABEL_72;
-		}
-
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-				dFlags[i][j] |= DFLAG_LIT;
-		}
-
-		InitTowners();
-		InitItems();
-		InitMissiles();
-		IncProgress();
-		if ( !firstflag && lvldir != 4 && plr[myplr]._pLvlVisited[currlevel] )
-		{
-			if ( gbMaxPlayers != 1 )
-				goto LABEL_53;
-			LoadLevel();
-		}
-		if ( gbMaxPlayers == 1 )
-			goto LABEL_54;
-LABEL_53:
-		DeltaLoadLevel();
-		goto LABEL_54;
-	}
-	pSpeedCels = DiabloAllocPtr(0x100000);
-	LoadSetMap();
-	IncProgress();
-	GetLevelMTypes();
-	InitMonsters();
-	InitMissileGFX();
-	InitDead();
-	FillSolidBlockTbls();
-	IncProgress();
-	if ( lvldir == 5 )
-		GetPortalLvlPos();
-
-	for(i = 0; i < MAX_PLRS; i++)
-	{
-		if ( plr[i].plractive )
-		{
-			if ( currlevel == plr[i].plrlevel )
-			{
-				InitPlayerGFX(v2);
-				if ( lvldir != 4 )
-					InitPlayer(v2, firstflag);
-			}
-		}
-		++v2;
-	}
-
-	InitMultiView();
-	IncProgress();
-	if ( firstflag || lvldir == 4 || !plr[myplr]._pSLvlVisited[(unsigned char)setlvlnum] )
-	{
-		InitItems();
-		SavePreLighting();
-	}
-	else
-	{
-		LoadLevel();
-	}
-	InitMissiles();
-	IncProgress();
-LABEL_72:
-	SyncPortals();
-
-	for(i = 0; i < MAX_PLRS; i++)
-	{
-		if ( plr[i].plractive && plr[i].plrlevel == currlevel && (!plr[i]._pLvlChanging || i == myplr) )
-		{
-			if ( plr[i]._pHitPoints <= 0 )
-				dFlags[plr[i].WorldX][plr[i].WorldY] |= DFLAG_DEAD_PLAYER;
-			else if ( gbMaxPlayers == 1 )
-				dPlayer[plr[i].WorldX][plr[i].WorldY] = i + 1;
-			else
-				SyncInitPlrPos(i);
-		}
-	}
-
-	if ( leveltype != DTYPE_TOWN )
-		SetDungeonMicros();
-	InitLightMax();
-	IncProgress();
-	IncProgress();
-	if ( firstflag )
-	{
-		InitControlPan();
-		IncProgress();
-	}
-	if ( leveltype != DTYPE_TOWN)
-	{
-		ProcessLightList();
-		ProcessVisionList();
-	}
-	music_start((unsigned char)leveltype);
-	//do
-	//	_LOBYTE(v19) = IncProgress();
-	while ( !IncProgress() );
-	if ( setlevel && setlvlnum == SL_SKELKING && quests[QTYPE_KING]._qactive == 2 )
-		PlaySFX(USFX_SKING1);
-}
-// 525738: using guessed type int setseed;
-// 5BB1ED: using guessed type char leveltype;
-// 5CCB10: using guessed type char setlvlnum;
-// 5CF31D: using guessed type char setlevel;
-// 679660: using guessed type char gbMaxPlayers;
-
-void __fastcall game_loop(BOOL bStartup)
-{
-	int v1; // ecx
-	int v2; // esi
-
-	v1 = bStartup != 0 ? 0x39 : 0;
-	v2 = v1 + 3;
-	if ( v1 != -3 )
-	{
-		while ( 1 )
-		{
-			--v2;
-			if ( !multi_handle_delta() )
-				break;
-			timeout_cursor(0);
-			game_logic();
-			if ( gbRunGame )
-			{
-				if ( gbMaxPlayers != 1 )
-				{
-					if ( nthread_has_500ms_passed(0) )
-					{
-						if ( v2 )
-							continue;
-					}
-				}
-			}
-			return;
-		}
-		timeout_cursor(1);
-	}
-}
-// 525650: using guessed type int gbRunGame;
-// 679660: using guessed type char gbMaxPlayers;
-
-void __cdecl game_logic()
-{
-	if ( PauseMode != 2 )
-	{
-		if ( PauseMode == 1 )
-			PauseMode = 2;
-		if ( gbMaxPlayers == 1 && gmenu_exception() )
-		{
-			drawpanflag |= 1u;
-		}
-		else
-		{
-			if ( !gmenu_exception() && sgnTimeoutCurs == CURSOR_NONE )
-			{
-				CheckCursMove();
-				track_process();
-			}
-			if ( gbProcessPlayers )
-				ProcessPlayers();
-			if ( leveltype != DTYPE_TOWN )
-			{
-				ProcessMonsters();
-				ProcessObjects();
-				ProcessMissiles();
-				ProcessItems();
-				ProcessLightList();
-				ProcessVisionList();
-			}
-			else
-			{
-				ProcessTowners();
-				ProcessItems();
-				ProcessMissiles();
-			}
-
-
-
-
-
-#ifdef _DEBUG
-			if ( debug_mode_key_inverted_v )
-			{
-				if ( GetAsyncKeyState(VK_SHIFT) & 0x8000 )
-					ScrollView();
-			}
-#endif
-			sound_update();
-			ClearPlrMsg();
-			CheckTriggers();
-			CheckQuests();
-			drawpanflag |= 1u;
-			pfile_update(0);
-		}
-	}
-}
-// 5256A0: using guessed type int gbProcessPlayers;
-// 525718: using guessed type char cineflag;
-// 52571C: using guessed type int drawpanflag;
-// 525740: using guessed type int PauseMode;
-// 5BB1ED: using guessed type char leveltype;
-// 679660: using guessed type char gbMaxPlayers;
-
-void __fastcall timeout_cursor(BOOL bTimeout)
-{
-	if ( bTimeout )
-	{
-		if ( sgnTimeoutCurs == CURSOR_NONE && !sgbMouseDown )
-		{
-			sgnTimeoutCurs = pcurs;
-			multi_net_ping();
-			ClearPanel();
-			AddPanelString("-- Network timeout --", 1);
-			AddPanelString("-- Waiting for players --", 1);
-			SetCursor_(CURSOR_HOURGLASS);
-			drawpanflag = 255;
-		}
-		scrollrt_draw_game_screen(1);
-	}
-	else if ( sgnTimeoutCurs )
-	{
-		SetCursor_(sgnTimeoutCurs);
-		sgnTimeoutCurs = 0;
-		ClearPanel();
-		drawpanflag = 255;
-	}
-}
-// 52571C: using guessed type int drawpanflag;
-// 525748: using guessed type char sgbMouseDown;
-
-void __cdecl diablo_color_cyc_logic()
-{
-	DWORD v0; // eax
-
-	v0 = GetTickCount();
-	if ( v0 - color_cycle_timer >= 0x32 )
-	{
-		color_cycle_timer = v0;
-		if ( palette_get_colour_cycling() )
-		{
-			if ( leveltype == DTYPE_HELL )
-			{
-				lighting_color_cycling();
-			}
-			else if ( leveltype == DTYPE_CAVES )
-			{
-				if ( fullscreen )
-					palette_update_caves();
-			}
-		}
-	}
-}
-// 484364: using guessed type int fullscreen;
-// 52574C: using guessed type int color_cycle_timer;
-// 5BB1ED: using guessed type char leveltype;
diff --git a/Stub/gamemenu.cpp b/Stub/gamemenu.cpp
deleted file mode 100644
index 79216ed96..000000000
--- a/Stub/gamemenu.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
-
-TMenuItem sgSingleMenu[6] =
-{
-  { 0x80000000, "Save Game", &gamemenu_save_game },
-  { 0x80000000, "Options", &gamemenu_options },
-  { 0x80000000, "New Game", &gamemenu_new_game },  /*BROKEN*/
-  { 0x80000000, "Load Game", &gamemenu_load_game },
-  { 0x80000000, "Quit Diablo", &gamemenu_quit_game },
-  { 0x80000000, NULL, NULL }
-};
-TMenuItem sgMultiMenu[5] =
-{
-  { 0x80000000, "Options", &gamemenu_options },
-  { 0x80000000, "New Game", &gamemenu_new_game },
-  { 0x80000000, "Restart In Town", &gamemenu_restart_town },
-  { 0x80000000, "Quit Diablo", &gamemenu_quit_game },
-  { 0x80000000, NULL, NULL }
-};
-TMenuItem sgOptionMenu[6] =
-{
-  { 0xC0000000, NULL, (void (__cdecl *)(void))&gamemenu_music_volume },
-  { 0xC0000000, NULL, (void (__cdecl *)(void))&gamemenu_sound_volume },
-  { 0xC0000000, "Gamma", (void (__cdecl *)(void))&gamemenu_gamma },
-  { 0x80000000, NULL, &gamemenu_color_cycling },
-  { 0x80000000, "Previous Menu", &gamemenu_previous },
-  { 0x80000000, NULL, NULL }
-};
-char *music_toggle_names[] = { "Music", "Music Disabled" };
-char *sound_toggle_names[] = { "Sound", "Sound Disabled" };
-char *color_cycling_toggle_names[] = { "Color Cycling Off", "Color Cycling On" };
-
-void __cdecl gamemenu_previous()
-{
-	void (__cdecl *v0)(); // edx
-	TMenuItem *v1; // ecx
-
-	if ( gbMaxPlayers == 1 )
-	{
-		v0 = gamemenu_enable_single;
-		v1 = sgSingleMenu;
-	}
-	else
-	{
-		v0 = gamemenu_enable_multi;
-		v1 = sgMultiMenu;
-	}
-	gmenu_call_proc(v1, v0);
-	PressEscKey();
-}
-// 679660: using guessed type char gbMaxPlayers;
-
-void __cdecl gamemenu_enable_single()
-{
-	bool v0; // dl
-
-	gmenu_enable(&sgSingleMenu[2], false);// Remove this when new game is working.
-	gmenu_enable(&sgSingleMenu[3], gbValidSaveFile);
-	v0 = 0;
-	if ( plr[myplr]._pmode != PM_DEATH && !deathflag )
-		v0 = 1;
-	gmenu_enable(sgSingleMenu, v0);
-}
-
-void __cdecl gamemenu_enable_multi()
-{
-	gmenu_enable(&sgMultiMenu[2], deathflag);
-}
-
-void __cdecl gamemenu_off()
-{
-	gmenu_call_proc(0, 0);
-}
-
-void __cdecl gamemenu_handle_previous()
-{
-	if ( gmenu_exception() )
-		gamemenu_off();
-	else
-		gamemenu_previous();
-}
-
-void __cdecl gamemenu_new_game()
- {
-NetSendCmdString(1 << myplr, "Broken Needs To Be Fixed!");
-
-
-	// int i; // eax
-
-	// for(i = 0; i < 4; i++)
-	// {
-	// 	plr[i]._pmode = PM_QUIT;
-	// 	plr[i]._pInvincible = 1;
-	// }
-
-	// deathflag = 0;
-	// drawpanflag = 255;
-	// scrollrt_draw_game_screen(1);
-	// gbRunGame = 0;
-	// gamemenu_off();
-
-
-	
-}
-// 525650: using guessed type int gbRunGame;
-// 52571C: using guessed type int drawpanflag;
-
-void __cdecl gamemenu_quit_game()
-{
-	//gamemenu_new_game();
-	int i;
-		for(i = 0; i < 4; i++)
-	{
-		plr[i]._pmode = PM_QUIT;
-		plr[i]._pInvincible = 1;
-	}
-
-	gbRunGame = 0;
-	gamemenu_off();
-	gbRunGameResult = 0;
-	
-}
-// 525698: using guessed type int gbRunGameResult;
-
-void __cdecl gamemenu_load_game()
-{
-	WNDPROC saveProc; // edi
-
-	saveProc = SetWindowProc(DisableInputWndProc);
-	gamemenu_off();
-	SetCursor_(0);
-	InitDiabloMsg(10);
-	drawpanflag = 255;
-	DrawAndBlit();
-	LoadGame(FALSE);
-	ClrDiabloMsg();
-	PaletteFadeOut(8);
-	deathflag = 0;
-	drawpanflag = 255;
-	DrawAndBlit();
-	PaletteFadeIn(8);
-	SetCursor_(CURSOR_HAND);
-	interface_msg_pump();
-	SetWindowProc(saveProc);
-}
-// 52571C: using guessed type int drawpanflag;
-
-void __cdecl gamemenu_save_game()
-{
-	WNDPROC saveProc; // edi
-
-	if ( pcurs == CURSOR_HAND )
-	{
-		if ( plr[myplr]._pmode == PM_DEATH || deathflag )
-		{
-			gamemenu_off();
-		}
-		else
-		{
-			saveProc = SetWindowProc(DisableInputWndProc);
-			SetCursor_(0);
-			gamemenu_off();
-			InitDiabloMsg(11);
-			drawpanflag = 255;
-			DrawAndBlit();
-			SaveGame();
-			ClrDiabloMsg();
-			drawpanflag = 255;
-			SetCursor_(CURSOR_HAND);
-			interface_msg_pump();
-			SetWindowProc(saveProc);
-		}
-	}
-}
-// 52571C: using guessed type int drawpanflag;
-
-void __cdecl gamemenu_restart_town()
-{
-	NetSendCmd(1u, CMD_RETOWN);
-}
-
-void __cdecl gamemenu_options()
-{
-	gamemenu_get_music();
-	gamemenu_get_sound();
-	gamemenu_get_gamma();
-	gamemenu_get_color_cycling();
-	gmenu_call_proc(sgOptionMenu, 0);
-}
-
-void __cdecl gamemenu_get_music()
-{
-	gamemenu_sound_music_toggle(music_toggle_names, sgOptionMenu, sound_get_or_set_music_volume(1));
-}
-
-void __fastcall gamemenu_sound_music_toggle(char **names, TMenuItem *menu_item, int gamma)
-{
-	if ( gbSndInited )
-	{
-		menu_item->dwFlags |= 0xC0000000;
-		menu_item->pszStr = *names;
-		gmenu_slider_3(menu_item, 17);
-		gmenu_slider_1(menu_item, VOLUME_MIN, VOLUME_MAX, gamma);
-	}
-	else
-	{
-		menu_item->dwFlags &= 0x3F000000;
-		menu_item->pszStr = names[1];
-	}
-}
-
-void __cdecl gamemenu_get_sound()
-{
-	gamemenu_sound_music_toggle(sound_toggle_names, &sgOptionMenu[1], sound_get_or_set_sound_volume(1));
-}
-
-void __cdecl gamemenu_get_color_cycling()
-{
-	sgOptionMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling()];
-}
-
-void __cdecl gamemenu_get_gamma()
-{
-	gmenu_slider_3(&sgOptionMenu[2], 15);
-	gmenu_slider_1(&sgOptionMenu[2], 30, 100, UpdateGamma(0));
-}
-
-void __fastcall gamemenu_music_volume(int a1)
-{
-	int v1; // esi
-
-	if ( a1 )
-	{
-		if ( gbMusicOn )
-		{
-			gbMusicOn = 0;
-			music_stop();
-			sound_get_or_set_music_volume(VOLUME_MIN);
-			goto LABEL_11;
-		}
-		gbMusicOn = 1;
-		sound_get_or_set_music_volume(VOLUME_MAX);
-LABEL_10:
-		music_start((unsigned char)leveltype);
-		goto LABEL_11;
-	}
-	v1 = gamemenu_slider_music_sound(sgOptionMenu);
-	sound_get_or_set_music_volume(v1);
-	if ( v1 != VOLUME_MIN )
-	{
-		if ( gbMusicOn )
-			goto LABEL_11;
-		gbMusicOn = 1;
-		goto LABEL_10;
-	}
-	if ( gbMusicOn )
-	{
-		gbMusicOn = 0;
-		music_stop();
-	}
-LABEL_11:
-	gamemenu_get_music();
-}
-// 4A22D4: using guessed type char gbMusicOn;
-// 5BB1ED: using guessed type char leveltype;
-
-int __fastcall gamemenu_slider_music_sound(TMenuItem *menu_item)
-{
-	return gmenu_slider_get(menu_item, VOLUME_MIN, VOLUME_MAX);
-}
-
-void __fastcall gamemenu_sound_volume(int a1)
-{
-	int v1; // ecx
-	int v2; // esi
-
-	if ( a1 ) {
-		if ( gbSoundOn ) {
-			gbSoundOn = 0;
-			FreeMonsterSnd();
-			v1 = VOLUME_MIN;
-		} else {
-			gbSoundOn = 1;
-		}
-		sound_get_or_set_sound_volume(VOLUME_MAX);
-	} else {
-		v2 = gamemenu_slider_music_sound(&sgOptionMenu[1]);
-		sound_get_or_set_sound_volume(v2);
-		if ( v2 == VOLUME_MIN ) {
-			if ( gbSoundOn ) {
-				gbSoundOn = 0;
-				FreeMonsterSnd();
-			}
-		} else if ( !gbSoundOn ) {
-			gbSoundOn = 1;
-		}
-	}
-	PlaySFX(IS_TITLEMOV);
-	gamemenu_get_sound();
-}
-// 4A22D5: using guessed type char gbSoundOn;
-
-void __fastcall gamemenu_gamma(int a1)
-{
-	int v1; // eax
-	int v2; // eax
-
-	if ( a1 )
-	{
-		v1 = -(UpdateGamma(0) != 30);
-		_LOBYTE(v1) = v1 & 0xBA;
-		v2 = v1 + 100;
-	}
-	else
-	{
-		v2 = gamemenu_slider_gamma();
-	}
-	UpdateGamma(v2);
-	gamemenu_get_gamma();
-}
-
-int __cdecl gamemenu_slider_gamma()
-{
-	return gmenu_slider_get(&sgOptionMenu[2], 30, 100);
-}
-
-void __cdecl gamemenu_color_cycling()
-{
-	palette_set_color_cycling(palette_get_colour_cycling() == 0);
-	sgOptionMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling() & 1];
-}
diff --git a/Stub/miniwin.h b/Stub/miniwin.h
index afa79acf5..9515cb7fa 100644
--- a/Stub/miniwin.h
+++ b/Stub/miniwin.h
@@ -89,11 +89,11 @@ typedef unsigned int *PUINT;
 typedef long long INT64 ALIGNED(8);
 typedef unsigned long long UINT64 ALIGNED(8);
 
-typedef int INT_PTR, *PINT_PTR;
-typedef unsigned int UINT_PTR, *PUINT_PTR;
+typedef intptr_t INT_PTR, *PINT_PTR;
+typedef uintptr_t UINT_PTR, *PUINT_PTR;
 
-typedef int32_t LONG_PTR, *PLONG_PTR;
-typedef uint32_t ULONG_PTR, *PULONG_PTR;
+typedef intptr_t LONG_PTR, *PLONG_PTR;
+typedef uintptr_t ULONG_PTR, *PULONG_PTR;
 typedef ULONG_PTR SIZE_T;
 
 typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
diff --git a/Stub/sdlrender.cpp b/Stub/sdlrender.cpp
index f71dfff45..bfb1f9fc3 100644
--- a/Stub/sdlrender.cpp
+++ b/Stub/sdlrender.cpp
@@ -925,7 +925,7 @@ void DrawPCXString(int x, int y, int w, int h, BYTE *str, BYTE *font, void *pBuf
 	}
 }
 
-int __fastcall GetPCXFontWidth(char *str, BYTE *font)
+int __fastcall GetPCXFontWidth(unsigned char *str, BYTE *font)
 {
 	int i;
 	int len = 0;