[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.67,1.68 intro.cpp,1.45,1.46 screen.cpp,1.57,1.58

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32588/sky

Modified Files:
	control.cpp intro.cpp screen.cpp 
Log Message:
renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- control.cpp	24 Feb 2004 22:39:40 -0000	1.67
+++ control.cpp	28 Feb 2004 12:58:12 -0000	1.68
@@ -378,13 +378,13 @@
 		_text->flushForRedraw();
 		pButton->drawToScreen(NO_MASK);
 		_text->drawToScreen(WITH_MASK);
-		_system->update_screen();
+		_system->updateScreen();
 		delay(150);
 		pButton->_curSprite--;
 		_text->flushForRedraw();
 		pButton->drawToScreen(NO_MASK);
 		_text->drawToScreen(WITH_MASK);
-		_system->update_screen();
+		_system->updateScreen();
 	}
 }
 
@@ -431,7 +431,7 @@
 
 	memset(_screenBuf, 0, GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
 	_system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
-	_system->update_screen();
+	_system->updateScreen();
 	_skyScreen->forceRefresh();
 	_skyScreen->setPaletteEndian((uint8 *)SkyEngine::fetchCompact(SkyEngine::_systemVars.currentPalette));
 	removePanel();
@@ -468,7 +468,7 @@
 
 	while (!quitPanel) {
 		_text->drawToScreen(WITH_MASK);
-		_system->update_screen();
+		_system->updateScreen();
 		_mouseClicked = false;
 		delay(50);
 		if (_keyPressed == 27) { // escape pressed
@@ -497,7 +497,7 @@
 	}
 	memset(_screenBuf, 0, GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
 	_system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
-	_system->update_screen();
+	_system->updateScreen();
 	_skyScreen->forceRefresh();
 	_skyScreen->setPaletteEndian((uint8 *)SkyEngine::fetchCompact(SkyEngine::_systemVars.currentPalette));
 	removePanel();
@@ -609,7 +609,7 @@
 			mouseType = wantMouse;
 			_skyMouse->spriteMouse(mouseType, 0, 0);
 		}
-		_system->update_screen();
+		_system->updateScreen();
 		delay(50);
 		if ((_mouseY >= 83) && (_mouseY <= 110)) {
 			if ((_mouseX >= 77) && (_mouseX <= 114)) { // over 'yes'
@@ -657,7 +657,7 @@
 		}
 		buttonControl(_slide2);
 		_text->drawToScreen(WITH_MASK);
-		_system->update_screen();
+		_system->updateScreen();
 	}
 	return 0;
 }
@@ -685,7 +685,7 @@
 		}
 		buttonControl(_slide);
 		_text->drawToScreen(WITH_MASK);
-		_system->update_screen();
+		_system->updateScreen();
 	}
 	SkyEngine::_systemVars.gameSpeed = speedDelay;
 	return SPEED_CHANGED;
@@ -705,7 +705,7 @@
 	}
 	pButton->drawToScreen(WITH_MASK);
 	buttonControl(pButton);
-	_system->update_screen();
+	_system->updateScreen();
 	return TOGGLED;
 }
 
@@ -729,7 +729,7 @@
 
 	drawTextCross(flags);
 
-	_system->update_screen();
+	_system->updateScreen();
 	return TOGGLED;
 }
 
@@ -848,7 +848,7 @@
 		}
 
 		_text->drawToScreen(WITH_MASK);
-		_system->update_screen();
+		_system->updateScreen();
 		_mouseClicked = false;
 		delay(50);
 		if (_keyPressed == 27) { // escape pressed
@@ -1547,7 +1547,7 @@
 	_skyText->fnSetFont(0);
 
 	_system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
-	_system->update_screen();
+	_system->updateScreen();
 
 	if (SkyEngine::_systemVars.gameVersion < 331)
 		_skyScreen->setPalette(60509);
@@ -1571,7 +1571,7 @@
 	} else {
 		memset(_screenBuf, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
 		_system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
-		_system->update_screen();
+		_system->updateScreen();
 		_skyScreen->showScreen(_skyScreen->giveCurrent());
 		_skyScreen->setPalette(60111);
 	}

Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- intro.cpp	6 Jan 2004 12:45:32 -0000	1.45
+++ intro.cpp	28 Feb 2004 12:58:12 -0000	1.46
@@ -793,7 +793,7 @@
 			} while (nrToDo == 255);
 		}
 		_system->copy_rect(scrollPos, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
-		_system->update_screen();
+		_system->updateScreen();
 		if (!escDelay(40))
 			doContinue = false;
 	}

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- screen.cpp	24 Feb 2004 22:39:40 -0000	1.57
+++ screen.cpp	28 Feb 2004 12:58:12 -0000	1.58
@@ -76,7 +76,7 @@
 	}
 
 	//set the palette
-	_system->set_palette(tmpPal, 0, VGA_COLOURS);
+	_system->setPalette(tmpPal, 0, VGA_COLOURS);
 	_currentPalette = 0;
 
 	_seqInfo.framesLeft = 0;
@@ -94,15 +94,15 @@
 	 
 	memset(_currentScreen, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
 	_system->copy_rect(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
-	_system->update_screen();
+	_system->updateScreen();
 }
 
 //set a new palette, pal is a pointer to dos vga rgb components 0..63
 void Screen::setPalette(uint8 *pal) {
 	
 	convertPalette(pal, _palette);
-	_system->set_palette(_palette, 0, GAME_COLOURS);
-	_system->update_screen();
+	_system->setPalette(_palette, 0, GAME_COLOURS);
+	_system->updateScreen();
 }
 
 void Screen::setPaletteEndian(uint8 *pal) {
@@ -115,8 +115,8 @@
 #else
 	convertPalette(pal, _palette);
 #endif
-	_system->set_palette(_palette, 0, GAME_COLOURS);
-	_system->update_screen();
+	_system->setPalette(_palette, 0, GAME_COLOURS);
+	_system->updateScreen();
 }
 
 void Screen::halvePalette(void) {
@@ -128,7 +128,7 @@
 		halfPalette[(cnt << 2) | 2] = _palette[(cnt << 2) | 2] >> 1;
 		halfPalette[(cnt << 2) | 3] = 0;
 	}
-	_system->set_palette(halfPalette, 0, GAME_COLOURS);
+	_system->setPalette(halfPalette, 0, GAME_COLOURS);
 }
 
 void Screen::setPalette(uint16 fileNum) {
@@ -152,7 +152,7 @@
 void Screen::showScreen(uint8 *pScreen) {
 
 	_system->copy_rect(pScreen, 320, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
-	_system->update_screen();
+	_system->updateScreen();
 }
 
 void Screen::convertPalette(uint8 *inPal, uint8* outPal) { //convert 3 byte 0..63 rgb to 4byte 0..255 rgbx
@@ -221,7 +221,7 @@
 		}
 	}
 	if (doUpdate)
-		_system->update_screen();
+		_system->updateScreen();
 }
 
 void Screen::fnDrawScreen(uint32 palette, uint32 scroll) {
@@ -247,8 +247,8 @@
 	} else {
 		for (uint8 cnt = 0; cnt < 32; cnt++) {
 			palette_fadedown_helper((uint32 *)_palette, GAME_COLOURS);
-			_system->set_palette(_palette, 0, GAME_COLOURS);
-			_system->update_screen();
+			_system->setPalette(_palette, 0, GAME_COLOURS);
+			_system->updateScreen();
 			_system->delay_msecs(20);
 		}
 	}
@@ -295,8 +295,8 @@
 			_palette[(colCnt << 2) | 1] = (tmpPal[(colCnt << 2) | 1] * cnt) >> 5;
 			_palette[(colCnt << 2) | 2] = (tmpPal[(colCnt << 2) | 2] * cnt) >> 5;
 		}
-		_system->set_palette(_palette, 0, GAME_COLOURS);
-		_system->update_screen();
+		_system->setPalette(_palette, 0, GAME_COLOURS);
+		_system->updateScreen();
 		_system->delay_msecs(20);
 	}	
 }
@@ -482,7 +482,7 @@
 			}
 			scrPtr += 15 * GAME_SCREEN_WIDTH;
 		}
-		_system->update_screen();
+		_system->updateScreen();
 		_seqInfo.framesLeft--;
 	}
 	if (_seqInfo.framesLeft == 0) {