Browse Source

fix VC build

pull/18/head
ChaosMarc 8 years ago
parent
commit
eefb443f87
  1. 2
      3rdParty/Storm/Source/storm.h
  2. 4
      Source/automap.cpp
  3. 2
      Source/engine.cpp
  4. 8
      Source/pfile.cpp

2
3rdParty/Storm/Source/storm.h vendored

@ -1295,7 +1295,7 @@ void __cdecl SDrawDestroy(void);
bool __cdecl StormDestroy(void);
bool __stdcall SFileSetBasePath(char *);
void __cdecl SDrawRealizePalette(void);
bool __cdecl SVidPlayContinue(void);
BOOL __cdecl SVidPlayContinue(void);
bool __stdcall SNetGetOwnerTurnsWaiting(int *);
void * __stdcall SNetUnregisterEventHandler(int,void (__stdcall*)(struct _SNETEVENT *));
void * __stdcall SNetRegisterEventHandler(int,void (__stdcall*)(struct _SNETEVENT *));

4
Source/automap.cpp

@ -5,8 +5,8 @@
#ifndef NO_GLOBALS
USHORT automaptype[512];
#endif
STATIC int MapX;
STATIC int MapY;
static int MapX;
static int MapY;
#ifndef NO_GLOBALS
bool automapflag; // idb
char AMbyte_4B7E4C[32];

2
Source/engine.cpp

@ -11,7 +11,7 @@ int orgseed; // weak
int sgnWidth;
int sglGameSeed; // weak
#endif
STATIC CRITICAL_SECTION sgMemCrit;
static CRITICAL_SECTION sgMemCrit;
#ifndef NO_GLOBALS
int SeedCount; // weak
int dword_52B99C; // bool valid - if x/y are in bounds

8
Source/pfile.cpp

@ -5,8 +5,8 @@
#define PASSWORD_SINGLE "xrgyrkj1"
#define PASSWORD_MULTI "szqnlsk1"
STATIC int pfile_cpp_init_value;
STATIC char hero_names[MAX_CHARACTERS][PLR_NAME_LEN];
static int pfile_cpp_init_value;
static char hero_names[MAX_CHARACTERS][PLR_NAME_LEN];
#ifndef NO_GLOBALS
BOOL gbValidSaveFile; // idb
#endif
@ -281,7 +281,7 @@ BOOL __stdcall pfile_ui_set_hero_infos(BOOL (__stdcall *ui_add_hero_info)(_uiher
break;
GetSaveDirectory(FileName, 260, (int)lpSrcStr);
v1 = strrchr(FileName, '\\') + 1;
if ( v1 != (char *)1 && OpenFile(FileName, &ReOpenBuff, 0x4000u) != INVALID_HANDLE )
if ( v1 != (char *)1 && OpenFile(FileName, &ReOpenBuff, 0x4000u) != HFILE_ERROR )
{
if ( !SRegLoadString("Diablo\\Converted", (const char *)v1, 0, NewFileName, 260) )
{
@ -289,7 +289,7 @@ BOOL __stdcall pfile_ui_set_hero_infos(BOOL (__stdcall *ui_add_hero_info)(_uiher
{
v3 = save_num++;
pfile_get_save_path(NewFileName, 260, v3);
if ( OpenFile(NewFileName, &ReOpenBuff, 0x4000u) == INVALID_HANDLE )
if ( OpenFile(NewFileName, &ReOpenBuff, 0x4000u) == HFILE_ERROR )
break;
if ( (unsigned int)save_num >= MAX_CHARACTERS )
goto LABEL_13;

Loading…
Cancel
Save