[Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.4,1.5 memory.cpp,1.2,1.3 resman.cpp,1.5,1.6

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv18866

Modified Files:
	build_display.cpp memory.cpp resman.cpp 
Log Message:
rename functions with windows specific names

Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build_display.cpp	28 Jul 2003 03:49:25 -0000	1.4
+++ build_display.cpp	28 Jul 2003 07:47:20 -0000	1.5
@@ -260,11 +260,11 @@
 			// update our fps reading
 
 			frameCount += 1;
-			if (timeGetTime() > cycleTime)
+			if (SVM_timeGetTime() > cycleTime)
 			{
 				fps = frameCount;
 				frameCount = 0;
-				cycleTime = timeGetTime()+1000;
+				cycleTime = SVM_timeGetTime()+1000;
 			}
  			//----------------------------------------------------
 			// check if we've got time to render the screen again this cycle
@@ -429,9 +429,9 @@
 	}
 	while(GetFadeStatus()==RDFADE_UP);
 
-	DWORD targetTime = timeGetTime() + (time*1000);
+	DWORD targetTime = SVM_timeGetTime() + (time*1000);
 
-	while(timeGetTime() < targetTime)
+	while(SVM_timeGetTime() < targetTime)
 	{
 		//--------------------------------------------------
 		// Service windows

Index: memory.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/memory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- memory.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ memory.cpp	28 Jul 2003 07:47:20 -0000	1.3
@@ -59,7 +59,7 @@
 {
 
 //unlock our supposedly locked in memory
-	VirtualUnlock(free_memman, total_free_memory);
+	SVM_VirtualUnlock(free_memman, total_free_memory);
 
 	free(free_memman);
 }
@@ -72,7 +72,7 @@
 	MEMORYSTATUS	memo;
 
 //find out how much actual physical RAM this computer has
-	GlobalMemoryStatus(&memo);
+	SVM_GlobalMemoryStatus(&memo);
 
 //now decide how much to grab - 8MB computer are super critical
 	if	(memo.dwTotalPhys<=(8000*1024))	//if 8MB or less :-O

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resman.cpp	28 Jul 2003 07:00:13 -0000	1.5
+++ resman.cpp	28 Jul 2003 07:47:20 -0000	1.6
@@ -1007,8 +1007,8 @@
 
 	if (i<total_clusters)
 	{
-		SetFileAttributes(resource_files[i], FILE_ATTRIBUTE_NORMAL);
-		DeleteFile(resource_files[i]);
+		SVM_SetFileAttributes(resource_files[i], FILE_ATTRIBUTE_NORMAL);
+		SVM_DeleteFile(resource_files[i]);
 		cdTab[i] &= (0xff - LOCAL_CACHE);
 		FILE *file;
 		file = fopen("cd.inf", "r+b");
@@ -1106,7 +1106,7 @@
 	RenderParallax(FetchBackgroundLayer(bgfile), 2);
 	res_man.Res_close(2950);		// release the screen resource
 
-	SetFileAttributes(resource_files[newCluster], FILE_ATTRIBUTE_NORMAL);	// Git rid of read-only status, if it is set.
+	SVM_SetFileAttributes(resource_files[newCluster], FILE_ATTRIBUTE_NORMAL);	// Git rid of read-only status, if it is set.
 
 	FILE *inFile, *outFile;
 	
@@ -1299,7 +1299,7 @@
 	FlipScreens();
 	FadeUp((float)0.75);
 
-	SetFileAttributes(resource_files[newCluster], FILE_ATTRIBUTE_NORMAL);	// Git rid of read-only status.
+	SVM_SetFileAttributes(resource_files[newCluster], FILE_ATTRIBUTE_NORMAL);	// Git rid of read-only status.
 
 	// Update cd.inf and cdTab
 	cdTab[newCluster] |= LOCAL_CACHE;
@@ -1338,7 +1338,7 @@
 		fseek(file, -3, SEEK_END);
 
 		char path[_MAX_PATH];
-		GetCurrentDirectory(_MAX_PATH, path);
+		SVM_GetCurrentDirectory(_MAX_PATH, path);
 
 		strcat(path, "\\");
 		strcat(path, resource_files[newCluster]);
@@ -1389,7 +1389,7 @@
 		{
 			sprintf(cdPath, "%c:\\", cdDrives[index]);
 
-			if (!GetVolumeInformation(cdPath, sCDName, _MAX_PATH, NULL, &dwMaxCompLength, &dwFSFlags, NULL, 0))
+			if (!SVM_GetVolumeInformation(cdPath, sCDName, _MAX_PATH, NULL, &dwMaxCompLength, &dwFSFlags, NULL, 0))
 			{
 				sCDName[0] = 0;		// Force the following code to ask for the correct CD.
 			}
@@ -1469,7 +1469,7 @@
 			{
 				sprintf(cdPath, "%c:\\", cdDrives[index]);
 
-				if (!GetVolumeInformation(cdPath, sCDName, _MAX_PATH, NULL, &dwMaxCompLength, &dwFSFlags, NULL, 0))
+				if (!SVM_GetVolumeInformation(cdPath, sCDName, _MAX_PATH, NULL, &dwMaxCompLength, &dwFSFlags, NULL, 0))
 				{
 					sCDName[0] = 0;
 				}