diff options
| -rw-r--r-- | sword2/build_display.cpp | 2 | ||||
| -rw-r--r-- | sword2/driver/driver96.h | 20 | ||||
| -rw-r--r-- | sword2/driver/misc.cpp | 2 | ||||
| -rw-r--r-- | sword2/resman.cpp | 2 |
4 files changed, 12 insertions, 14 deletions
diff --git a/sword2/build_display.cpp b/sword2/build_display.cpp index 91ef71c81f..2005a7a71b 100644 --- a/sword2/build_display.cpp +++ b/sword2/build_display.cpp @@ -429,7 +429,7 @@ void DisplayMsg( uint8 *text, int time ) // Chris 15May97 } while(GetFadeStatus()==RDFADE_UP); - DWORD targetTime = SVM_timeGetTime() + (time*1000); + uint32 targetTime = SVM_timeGetTime() + (time*1000); while(SVM_timeGetTime() < targetTime) { diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h index ba6062e68c..0b222fc5b3 100644 --- a/sword2/driver/driver96.h +++ b/sword2/driver/driver96.h @@ -1256,11 +1256,9 @@ typedef int BOOL; #define FALSE 0 #ifdef WIN32 -#undef DWORD #undef LARGE_INTEGER #endif -typedef uint32 DWORD; typedef long int LARGE_INTEGER; // @@ -1438,14 +1436,14 @@ typedef struct // should probably remove this struct as it just replaces a windows struct... typedef struct { - DWORD dwLength; - DWORD dwMemoryLoad; - DWORD dwTotalPhys; - DWORD dwAvailPhys; - DWORD dwTotalPageFile; - DWORD dwAvailPageFile; - DWORD dwTotalVirtual; - DWORD dwAvailVirtual; + uint32 dwLength; + uint32 dwMemoryLoad; + uint32 dwTotalPhys; + uint32 dwAvailPhys; + uint32 dwTotalPageFile; + uint32 dwAvailPageFile; + uint32 dwTotalVirtual; + uint32 dwAvailVirtual; } GCC_PACK SVM_MEMORYSTATUS; // @@ -1619,7 +1617,7 @@ extern void SVM_GlobalMemoryStatus(SVM_MEMORYSTATUS *memo); extern void SVM_SetFileAttributes(char *file, uint32 atrib); extern void SVM_DeleteFile(char *file); extern void SVM_GetCurrentDirectory(uint32 max, char* path); -extern int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, DWORD *dwMaxCompLength, DWORD *dwFSFlags, uint8 *, uint32 a); +extern int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, uint32 *dwMaxCompLength, uint32 *dwFSFlags, uint8 *, uint32 a); extern void scumm_mkdir(const char *pathname); extern void SVM_GetModuleFileName(void *module, char *destStr, uint32 maxLen); diff --git a/sword2/driver/misc.cpp b/sword2/driver/misc.cpp index 5a78ba6aa3..efd35ecf2a 100644 --- a/sword2/driver/misc.cpp +++ b/sword2/driver/misc.cpp @@ -46,7 +46,7 @@ void SVM_GetCurrentDirectory(uint32 max, char* path) { warning("stub GetCurrentDirectory"); } -int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, DWORD *dwMaxCompLength, DWORD *dwFSFlags, uint8 *, uint32 a) { +int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, uint32 *dwMaxCompLength, uint32 *dwFSFlags, uint8 *, uint32 a) { warning("stub GetVolumeInformation %s", cdPath); strcpy(sCDName, CD1_LABEL); return 1; diff --git a/sword2/resman.cpp b/sword2/resman.cpp index f9732125a5..e3fa62083d 100644 --- a/sword2/resman.cpp +++ b/sword2/resman.cpp @@ -1357,7 +1357,7 @@ void resMan::GetCd(int cd) { bool done = false; char sCDName[_MAX_PATH]; - DWORD dwMaxCompLength, dwFSFlags; + uint32 dwMaxCompLength, dwFSFlags; mem *text_spr; _frameHeader *frame; _spriteInfo spriteInfo; |