[Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.7,1.8 misc.cpp,1.4,1.5 palette.cpp,1.3,1.4 render.cpp,1.3,1.4
Jonathan Gray
khalek at users.sourceforge.net
Mon Jul 28 00:48:11 CEST 2003
Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv18866/driver
Modified Files:
driver96.h misc.cpp palette.cpp render.cpp
Log Message:
rename functions with windows specific names
Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- driver96.h 28 Jul 2003 07:36:26 -0000 1.7
+++ driver96.h 28 Jul 2003 07:47:20 -0000 1.8
@@ -1612,30 +1612,18 @@
extern int32 SetFxVolumePan(int32 id, uint8 vol, int8 pan);
extern int32 SetFxIdVolume(int32 id, uint8 vol);
-#ifdef WIN32
-
-#undef timeGetTime
-#undef VirtualUnlock
-#undef GlobalMemoryStatus
-#undef SetFileAttributes
-#undef GetCurrentDirectory
-#undef GetVolumeInformation
-#undef GetModuleFileName
-
-#endif
-
//-----------------------------------------------------------------------------
// Misc functions - from misc.cpp
//-----------------------------------------------------------------------------
-extern uint32 timeGetTime(void);
-extern void VirtualUnlock(uint8 *free_memman, uint32 total_free_memory);
-extern void GlobalMemoryStatus(MEMORYSTATUS *memo);
-extern void SetFileAttributes(char *file, uint32 atrib);
-extern void DeleteFile(char *file);
-extern void GetCurrentDirectory(uint32 max, char* path);
-extern int32 GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, DWORD *dwMaxCompLength, DWORD *dwFSFlags, uint8 *, uint32 a);
+extern uint32 SVM_timeGetTime(void);
+extern void SVM_VirtualUnlock(uint8 *free_memman, uint32 total_free_memory);
+extern void SVM_GlobalMemoryStatus(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 void scumm_mkdir(const char *pathname);
-extern void GetModuleFileName(void *module, char *destStr, uint32 maxLen);
+extern void SVM_GetModuleFileName(void *module, char *destStr, uint32 maxLen);
//-----------------------------------------------------------------------------
//Macro for calling error handler with source filename and line.
Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/misc.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- misc.cpp 28 Jul 2003 07:36:27 -0000 1.4
+++ misc.cpp 28 Jul 2003 07:47:21 -0000 1.5
@@ -21,32 +21,32 @@
#include "driver96.h"
#include "../sword2.h"
-uint32 timeGetTime(void) {
+uint32 SVM_timeGetTime(void) {
return g_bs2->_syst->get_msecs();
}
-void VirtualUnlock(uint8 *free_memman, uint32 total_free_memory) {
+void SVM_VirtualUnlock(uint8 *free_memman, uint32 total_free_memory) {
warning("stub VirtualUnlock");
}
-void GlobalMemoryStatus(MEMORYSTATUS *memo) {
+void SVM_GlobalMemoryStatus(MEMORYSTATUS *memo) {
warning("stub GlobalMemoryStatus");
memo->dwTotalPhys = 16000*1024; // hard code 16mb for now
}
-void SetFileAttributes(char *file, uint32 atrib) {
+void SVM_SetFileAttributes(char *file, uint32 atrib) {
warning("stub SetFileAttributes");
}
-void DeleteFile(char *file) {
+void SVM_DeleteFile(char *file) {
warning("stub DeleteFile");
}
-void GetCurrentDirectory(uint32 max, char* path) {
+void SVM_GetCurrentDirectory(uint32 max, char* path) {
warning("stub GetCurrentDirectory");
}
-int32 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 *, DWORD *dwMaxCompLength, DWORD *dwFSFlags, uint8 *, uint32 a) {
warning("stub GetVolumeInformation %s", cdPath);
strcpy(sCDName, CD1_LABEL);
return 1;
@@ -57,7 +57,7 @@
warning("stub scumm_mkdir %s", pathname);
}
-void GetModuleFileName(void *module, char *destStr, uint32 maxLen) {
+void SVM_GetModuleFileName(void *module, char *destStr, uint32 maxLen) {
warning("stub GetModuleFileName");
}
Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/palette.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- palette.cpp 28 Jul 2003 07:22:40 -0000 1.3
+++ palette.cpp 28 Jul 2003 07:47:21 -0000 1.4
@@ -378,7 +378,7 @@
fadeTotalTime = (int32) (time * 1000);
fadeStatus = RDFADE_UP;
- fadeStartTime = timeGetTime();
+ fadeStartTime = SVM_timeGetTime();
return RD_OK;
@@ -394,7 +394,7 @@
fadeTotalTime = (int32) (time * 1000);
fadeStatus = RDFADE_DOWN;
- fadeStartTime = timeGetTime();
+ fadeStartTime = SVM_timeGetTime();
return RD_OK;
Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- render.cpp 28 Jul 2003 07:22:40 -0000 1.3
+++ render.cpp 28 Jul 2003 07:47:21 -0000 1.4
@@ -901,7 +901,7 @@
{
- initialTime = timeGetTime();
+ initialTime = SVM_timeGetTime();
originTime = initialTime;
totalTime = initialTime + MILLISECSPERCYCLE;
@@ -919,7 +919,7 @@
scrollxOld = scrollx;
scrollyOld = scrolly;
- startTime = timeGetTime();
+ startTime = SVM_timeGetTime();
if (startTime + renderAverageTime >= totalTime)
{
@@ -948,7 +948,7 @@
int32 time;
- time = timeGetTime();
+ time = SVM_timeGetTime();
renderTimeLog[renderCountIndex] = time - startTime;
startTime += renderTimeLog[renderCountIndex];
renderAverageTime = (renderTimeLog[0] + renderTimeLog[1] + renderTimeLog[2] + renderTimeLog[3]) >> 2;
More information about the Scummvm-git-logs
mailing list