aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWon Star2006-01-06 13:13:58 +0000
committerWon Star2006-01-06 13:13:58 +0000
commit1ab01a6fb76fcf6ab960229ecb65ecfe15c7159d (patch)
tree25233b97912615631eeab13f95cb1066fbc79864
parent8b4627d2470e97a272adfcaec31fd0ea1156aa24 (diff)
downloadscummvm-rg350-1ab01a6fb76fcf6ab960229ecb65ecfe15c7159d.tar.gz
scummvm-rg350-1ab01a6fb76fcf6ab960229ecb65ecfe15c7159d.tar.bz2
scummvm-rg350-1ab01a6fb76fcf6ab960229ecb65ecfe15c7159d.zip
Oops
svn-id: r19930
-rw-r--r--backends/gp32/gp32_launcher.cpp4
-rw-r--r--backends/gp32/gp32std.cpp2
-rw-r--r--backends/gp32/gp32std_grap.cpp8
3 files changed, 7 insertions, 7 deletions
diff --git a/backends/gp32/gp32_launcher.cpp b/backends/gp32/gp32_launcher.cpp
index 43753e2f70..2d6932f201 100644
--- a/backends/gp32/gp32_launcher.cpp
+++ b/backends/gp32/gp32_launcher.cpp
@@ -115,9 +115,9 @@ void configMenu() {
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();
diff --git a/backends/gp32/gp32std.cpp b/backends/gp32/gp32std.cpp
index bacf232310..aa59ce1bed 100644
--- a/backends/gp32/gp32std.cpp
+++ b/backends/gp32/gp32std.cpp
@@ -158,7 +158,7 @@ GPFILE *gp_fopen(const char *fileName, const char *openMode) {
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;
diff --git a/backends/gp32/gp32std_grap.cpp b/backends/gp32/gp32std_grap.cpp
index ded5b34107..d96f960a9c 100644
--- a/backends/gp32/gp32std_grap.cpp
+++ b/backends/gp32/gp32std_grap.cpp
@@ -92,8 +92,8 @@ void gp_fillRect(uint16 *frameBuffer, int16 x, int16 y, int16 w, int16 h, uint16
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 @@ void gp_initGammaTable(float value)
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 @@ void gp_16ToRGB(uint16 color, uint8 *r, uint8 *g, uint8 *b) {
*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];