[Scummvm-cvs-logs] CVS: scummvm/backends/gp32 gp32_launcher.cpp,1.2,1.3 gp32std.cpp,1.2,1.3 gp32std_grap.cpp,1.4,1.5

Won star wonst719 at users.sourceforge.net
Fri Jan 6 05:17:54 CET 2006


Update of /cvsroot/scummvm/scummvm/backends/gp32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26416

Modified Files:
	gp32_launcher.cpp gp32std.cpp gp32std_grap.cpp 
Log Message:
Oops

Index: gp32_launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32_launcher.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gp32_launcher.cpp	6 Jan 2006 12:48:47 -0000	1.2
+++ gp32_launcher.cpp	6 Jan 2006 13:13:58 -0000	1.3
@@ -115,9 +115,9 @@
 		gp_textOut(frameBuffer2, 220, 40, text, 0);
 		sprintf(text, "%.2f", (float)gammaTable[currentSetting[1]] / 10000);
 		gp_textOut(frameBuffer2, 220, 80, text, 0);
-		gp_textOut(frameBuffer2, 220, 120, oplTable[currentSetting[2]], gp_RGBTo16(128, 128, 128));
+		gp_textOut(frameBuffer2, 220, 120, oplTable[currentSetting[2]], 0);
 		sprintf(text, "%d Hz", sampleTable[currentSetting[3]]);
-		gp_textOut(frameBuffer2, 220, 160, text, gp_RGBTo16(128, 128, 128));
+		gp_textOut(frameBuffer2, 220, 160, text, 0);
 
 		gp_flipScreen();
 

Index: gp32std.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32std.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gp32std.cpp	6 Jan 2006 12:48:47 -0000	1.2
+++ gp32std.cpp	6 Jan 2006 13:13:58 -0000	1.3
@@ -158,7 +158,7 @@
 		file->cachePos = 0;
 		mode = OPEN_W;
 		err = GpFileCreate(fileName, ALWAYS_CREATE, &file->handle);
-	} else if(tolower(openMode[0]) == 'a') {
+	} else if (tolower(openMode[0]) == 'a') {
 		warning("We do not support 'a' file open mode.");
 		free(file);
 		return NULL;

Index: gp32std_grap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32std_grap.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gp32std_grap.cpp	6 Jan 2006 12:48:47 -0000	1.4
+++ gp32std_grap.cpp	6 Jan 2006 13:13:58 -0000	1.5
@@ -92,8 +92,8 @@
 
 void gp_initGammaTable(float value)
 {
-	for(int i = 0; i < 256; i++) {
-		if(value == 1.0f) {
+	for (int i = 0; i < 256; i++) {
+		if (value == 1.0f) {
 			gammaLUT[i] = i;
 			gammaLUTInv[i] = i;
 		} else {
@@ -105,7 +105,7 @@
 
 uint16 gp_RGBTo16(uint16 r, uint16 g, uint16 b) {
 	// GP32 16bit color 5551
-	if(g_vars.gammaRamp != 10000) {
+	if (g_vars.gammaRamp != 10000) {
 		r = gammaLUT[r];
 		g = gammaLUT[g];
 		b = gammaLUT[b];
@@ -118,7 +118,7 @@
 	*g = ((((color) >> 6) & 0x1F) << 3);	//(((color>>5)&0x3F) << 2);
 	*b = ((((color) >> 1) & 0x1F) << 3);	//((color&0x1F) << 3);
 
-	if(g_vars.gammaRamp != 10000) {
+	if (g_vars.gammaRamp != 10000) {
 		*r = gammaLUTInv[*r];
 		*g = gammaLUTInv[*g];
 		*b = gammaLUTInv[*b];





More information about the Scummvm-git-logs mailing list