Remove delta to devilution

Source/codec.cpp

@@ -2,18 +2,6 @@
 
 #include "../types.h"
 
-#ifdef MINIWIN
-#define srand srand_miniwin
-#define rand rand_miniwin
-#endif
-
-#ifdef ANDROID
-#define srand srand_miniwin
-#define rand rand_miniwin
-#endif
-
-
-
 int __fastcall codec_decode(void *pbSrcDst, int size, char *pszPassword)
 {
 	unsigned int v3; // ebx

Source/debug.cpp

@@ -2,11 +2,9 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 void *pSquareCel;
 char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
 char dFlagDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
-#endif
 
 void __cdecl LoadDebugGFX()
 {

Source/diablo.cpp

@@ -64,8 +64,6 @@ char *spszMsgTbl[4] = {
 };                                                      // weak
 char *spszMsgKeyTbl[4] = { "F9", "F10", "F11", "F12" }; // weak
 
-bool CUSTOM_SDL_KEY_LSHIFT;
-
 void __cdecl FreeGameMem()
 {
 	void *p;

Source/drlg_l1.cpp

@@ -2,7 +2,6 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 char L5dungeon[80][80];
 char mydflags[40][40];
 int setloadflag; // weak
@@ -13,7 +12,6 @@ int VR1;
 int VR2;
 int VR3;
 void *pSetPiece; // idb
-#endif
 
 const ShadowStruct SPATS[37] = {
 	// clang-format off

Source/drlg_l2.cpp

@@ -2,7 +2,6 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 int nSx1;
 int nSx2; // weak
 int nSy1;
@@ -11,7 +10,6 @@ int nRoomCnt;
 char predungeon[40][40];
 ROOMNODE RoomList[81];
 HALLNODE *pHallList;
-#endif
 
 int Area_Min = 2;  // weak
 int Room_Max = 10; // weak

Source/drlg_l4.cpp

@@ -2,7 +2,6 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 int diabquad1x; // weak
 int diabquad1y; // weak
 int diabquad3x; // idb
@@ -21,7 +20,6 @@ int SP4y2;   // weak
 char L4dungeon[80][80];
 char dung[20][20];
 //int dword_52A4DC; // weak
-#endif
 
 const unsigned char L4ConvTbl[16] = { 30u, 6u, 1u, 6u, 2u, 6u, 6u, 6u, 9u, 6u, 1u, 6u, 2u, 6u, 3u, 6u };
 const unsigned char L4USTAIRS[42] = {

Source/effects.cpp

@@ -1052,11 +1052,11 @@ void __fastcall stream_play(TSFX *pSFX, int lVolume, int lPan)
 		if (lVolume > VOLUME_MAX)
 			lVolume = VOLUME_MAX;
 #ifdef _DEBUG
-		//SFileEnableDirectAccess(FALSE);
+		SFileEnableDirectAccess(FALSE);
 #endif
 		success = SFileOpenFile(pSFX->pszName, &sfx_stream);
 #ifdef _DEBUG
-		//SFileEnableDirectAccess(TRUE);
+		SFileEnableDirectAccess(TRUE);
 #endif
 		if (!success) {
 			sfx_stream = 0;

Source/engine.cpp

@@ -1,7 +1,6 @@
 //HEADER_GOES_HERE
 
 #include "../types.h"
-#include "miniwin_sdl.h"
 
 char gbPixelCol;  // automap pixel color 8-bit (palette entry)
 int dword_52B970; // BOOLEAN flip - if y < x
@@ -1535,17 +1534,6 @@ int __fastcall random(BYTE idx, int v)
 	return (GetRndSeed() >> 16) % v;
 }
 
-#ifndef MINIWIN
-struct engine_cpp_init_2
-{
-	engine_cpp_init_2()
-	{
-		mem_init_mutex();
-		mem_atexit_mutex();
-	}
-} _engine_cpp_init_2;
-#endif
-
 #ifndef _MSC_VER
 __attribute__((constructor))
 #endif

Source/gendung.cpp

@@ -2,7 +2,6 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 short level_frame_types[2048];
 int themeCount;
 char nTransTable[2049];
@@ -69,7 +68,6 @@ char dMissile[MAXDUNX][MAXDUNY];
 int dminx; // weak
 int dminy; // weak
 short dpiece_defs_map_2[16][MAXDUNX][MAXDUNY];
-#endif
 
 void __cdecl FillSolidBlockTbls()
 {

Source/init.h

@@ -39,6 +39,5 @@ extern const int init_inf; // weak
 
 extern char gszVersionNumber[260];
 extern char gszProductName[260];
-extern int SelectedItem;
 
 #endif /* __INIT_H__ */

Source/interfac.cpp

@@ -86,7 +86,7 @@ void __fastcall ShowProgress(unsigned int uMsg)
 	DrawCutscene();
 	PaletteFadeIn(8);
 	IncProgress();
-	stream_update(); // What is this?
+	stream_update();
 	IncProgress();
 	switch (uMsg) {
 	case WM_DIABNEXTLVL:

Source/lighting.cpp

@@ -2,7 +2,6 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 LightListStruct VisionList[32];
 char lightactive[32];
 LightListStruct LightList[32];
@@ -16,7 +15,6 @@ char dung_map_rgba[16384]; /* int [64][64] short [64][128] char [64][256] */
 int visionid;
 char *pLightTbl; /* todo: struct? */
 BOOL lightflag;
-#endif
 
 char CrawlTable[2749] = {
 	1,

Source/mainmenu.cpp

@@ -2,8 +2,6 @@
 
 #include "../types.h"
 
-#include "diablo.h"
-
 char gszHero[16];
 
 /* data */

Source/nthread.cpp

@@ -32,16 +32,8 @@ nthread_c_init(void)
 	nthread_cleanup_mutex_atexit();
 }
 
-#ifndef MINIWIN
+SEG_ALLOCATE(SEGMENT_C_INIT)
-struct nthread_cpp_init_2
+_PVFV nthread_c_init_funcs[] = { &nthread_c_init };
-{
-	nthread_cpp_init_2()
-	{
-		nthread_init_mutex();
-		nthread_cleanup_mutex_atexit();
-	}
-} _nthread_cpp_init_2;
-#endif
 
 void __cdecl nthread_init_mutex()
 {

Source/path.cpp

@@ -2,7 +2,6 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 // preallocated nodes, search is terminated after 300 nodes are visited
 PATHNODE path_nodes[MAXPATHNODES];
 // size of the pnode_tblptr stack
@@ -19,7 +18,6 @@ PATHNODE *pnode_ptr;
 PATHNODE *pnode_tblptr[MAXPATHNODES];
 // a linked list of the A* frontier, sorted by distance
 PATHNODE *path_2_nodes;
-#endif
 
 // for iterating over the 8 possible movement directions
 const char pathxdir[8] = { -1, -1, 1, 1, -1, 0, 1, 0 };

Source/pfile.cpp

@@ -113,16 +113,7 @@ BOOL __fastcall pfile_open_archive(BOOL a1, unsigned int save_num)
     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);
@@ -132,9 +123,7 @@ 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)

Source/pfile.h

@@ -3,12 +3,6 @@
 #define __PFILE_H__
 
 extern BOOL gbValidSaveFile; // idb
-extern char hero_names[MAX_CHARACTERS][PLR_NAME_LEN];
-
-
-
-
-
 
 void __cdecl pfile_init_save_directory();
 void __fastcall pfile_check_available_space(char *pszDir);

Source/portal.cpp

@@ -2,10 +2,8 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 PortalStruct portal[MAXPORTAL];
 int portalindex;
-#endif
 
 int WarpDropX[MAXPORTAL] = { 57, 59, 61, 63 };
 int WarpDropY[MAXPORTAL] = { 40, 40, 40, 40 };

Source/render.cpp

@@ -3,14 +3,12 @@
 #include "../types.h"
 #include "_asm.cpp"
 
-#ifndef NO_GLOBALS
 int WorldBoolFlag = 0;
 unsigned int gdwCurrentMask = 0;
 // char world_4B3264 = 0;
 unsigned char *gpCelFrame = NULL;
 unsigned int *gpDrawMask = NULL;
 // char world_4B326D[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-#endif
 
 unsigned int RightMask[32] = {
 	0xEAAAAAAA, 0xF5555555, 0xFEAAAAAA, 0xFF555555, 0xFFEAAAAA, 0xFFF55555, 0xFFFEAAAA, 0xFFFF5555,

Source/sha.cpp

@@ -2,9 +2,7 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 SHA1Context sgSHA1[3];
-#endif
 
 void __cdecl SHA1Clear()
 {

Source/sync.cpp

@@ -2,13 +2,11 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 short sync_word_6AA708[MAXMONSTERS];
 int syncmonsters; // weak
 short sync_word_6AA89C[MAXMONSTERS];
 int syncitems;
 int sgnSyncPInv; // weak
-#endif
 
 int __fastcall sync_all_monsters(TSyncHeader *packet, int size)
 {

Source/towners.cpp

@@ -2,7 +2,6 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 int storeflag; // weak
 int sgnCowMsg;
 int numtowners; // idb
@@ -11,7 +10,6 @@ int bannerflag;  // weak // unused 0x6AAC28
 int boyloadflag; // weak
 BYTE *pCowCels;
 TownerStruct towner[16];
-#endif
 
 const int snSFX[3][3] = {
 	{ PS_WARR52, PS_ROGUE52, PS_MAGE52 },

Source/trigs.cpp

@@ -2,11 +2,9 @@
 
 #include "../types.h"
 
-#ifndef NO_GLOBALS
 int trigflag[MAXTRIGGERS];
 TriggerStruct trigs[MAXTRIGGERS];
 int TWarpFrom; // weak
-#endif
 
 int TownDownList[11] = { 716, 715, 719, 720, 721, 723, 724, 725, 726, 727, -1 };
 int TownWarp1List[13] = {

Stub/diablo.cpp

@@ -2221,9 +2221,6 @@ void __fastcall game_loop(BOOL bStartup)
 // 525650: using guessed type int gbRunGame;
 // 679660: using guessed type char gbMaxPlayers;
 
-
-bool CUSTOM_SDL_KEY_LSHIFT;
-
 void __cdecl game_logic()
 {
 	if ( PauseMode != 2 )

Stub/diabloui.cpp

@@ -5,8 +5,8 @@
 #include "stubs.h"
 
 char chr_name_str[16];
+char hero_names[MAX_CHARACTERS][PLR_NAME_LEN];
 
-int SelectedItem = 1;
 int SelectedItemMax = 0;
 int MenuItem[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 int PreviousItem[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };

Stub/miniwin_msg_sdl.cpp

@@ -94,7 +94,6 @@ static int translate_sdl_key(SDL_Keysym key)
 		} else if (sym >= SDLK_F1 && sym <= SDLK_F12) {
 			return VK_F1 + (sym - SDLK_F1);
 		}
-		CUSTOM_SDL_KEY_LSHIFT = 0;
 
 
 		DUMMY_PRINT("unknown key: name=%s sym=0x%X scan=%d mod=0x%X", SDL_GetKeyName(sym), sym, key.scancode, key.mod);

Stub/sdlrender.cpp

@@ -31,6 +31,7 @@ bool SinglePlayerMenuItemsLoaded = 0;
 bool DiabloImageLoaded = 0;
 bool DiabloMainMenuListLoaded = 0;
 bool TitleImageLoaded = false;
+int SelectedItem = 1;
 
 void *pPcxLogoImage;
 int gdwLogoWidth;

Stub/sdlrender.h

@@ -55,6 +55,7 @@ extern int gdwCreditsWidth;
 extern int gdwCreditsHeight;
 
 extern bool TitleImageLoaded;
+extern int SelectedItem;
 
 extern int totalFrames;
 //extern SDL_Texture* spriteSheet;