[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.14,1.15 animation.h,1.5,1.6 control.cpp,1.26,1.27 music.cpp,1.23,1.24 screen.cpp,1.39,1.40

[Max Horn]

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

Modified Files:
	animation.cpp animation.h control.cpp music.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: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- animation.cpp	22 Feb 2004 18:13:54 -0000	1.14
+++ animation.cpp	28 Feb 2004 12:58:13 -0000	1.15
@@ -104,7 +104,7 @@
 
 	palnum = 0;
 	maxPalnum = p;
-	_sys->set_palette(palettes[palnum].pal, 0, 256);
+	_sys->setPalette(palettes[palnum].pal, 0, 256);
 	lut = lut2 = lookup[0];
 	curpal = -1;
 	cr = 0;
@@ -113,7 +113,7 @@
 	lutcalcnum = (BITDEPTH + palettes[palnum].end + 2) / (palettes[palnum].end + 2);
 #else
 	buildLookup();
-	overlay = (NewGuiColor*)calloc(MOVIE_WIDTH * MOVIE_HEIGHT, sizeof(NewGuiColor));
+	overlay = (OverlayColor*)calloc(MOVIE_WIDTH * MOVIE_HEIGHT, sizeof(OverlayColor));
 	_sys->show_overlay();
 #endif
 
@@ -208,7 +208,7 @@
 	if (framenum == palettes[palnum].end) {
 		unsigned char *l = lut2;
 		palnum++;
-		_sys->set_palette(palettes[palnum].pal, 0, 256);
+		_sys->setPalette(palettes[palnum].pal, 0, 256);
 		lutcalcnum = (BITDEPTH + palettes[palnum].end - (framenum + 1) + 2) / (palettes[palnum].end - (framenum + 1) + 2);
 		lut2 = lut;
 		lut = l;
@@ -220,13 +220,13 @@
 
 #else
 
-NewGuiColor *AnimationState::lookup = 0;
+OverlayColor *AnimationState::lookup = 0;
 
 void AnimationState::buildLookup() {
 	if (lookup)
 		return;
 
-	lookup = (NewGuiColor *)calloc(BITDEPTH * BITDEPTH * 256, sizeof(NewGuiColor));
+	lookup = (OverlayColor *)calloc(BITDEPTH * BITDEPTH * 256, sizeof(OverlayColor));
 
 	int y, cb, cr;
 	int r, g, b;
@@ -252,9 +252,9 @@
 	}
 }
 
-void AnimationState::plotYUV(NewGuiColor *lut, int width, int height, byte *const *dat) {
+void AnimationState::plotYUV(OverlayColor *lut, int width, int height, byte *const *dat) {
 
-	NewGuiColor *ptr = overlay + (MOVIE_HEIGHT - height) / 2 * MOVIE_WIDTH + (MOVIE_WIDTH - width) / 2;
+	OverlayColor *ptr = overlay + (MOVIE_HEIGHT - height) / 2 * MOVIE_WIDTH + (MOVIE_WIDTH - width) / 2;
 
 	int x, y;
 
@@ -377,7 +377,7 @@
 	if (anim->init(filename)) {
 		while (anim->decodeFrame()) {
 #ifndef BACKEND_8BIT
-			_sys->update_screen();
+			_sys->updateScreen();
 #endif
 			// FIXME: check for ESC and abbort animation be just returning from the function
 			OSystem::Event event;

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- animation.h	12 Feb 2004 17:16:38 -0000	1.5
+++ animation.h	28 Feb 2004 12:58:13 -0000	1.6
@@ -111,8 +111,8 @@
 		byte pal[4 * 256];
 	} palettes[50];
 #else
-	static NewGuiColor *lookup;
-	NewGuiColor * overlay;
+	static OverlayColor *lookup;
+	OverlayColor * overlay;
 #endif
 
 public:
@@ -130,7 +130,7 @@
 	bool checkPaletteSwitch();
 #else
 	void buildLookup(void);
-	void plotYUV(NewGuiColor *lut, int width, int height, byte *const *dat);
+	void plotYUV(OverlayColor *lut, int width, int height, byte *const *dat);
 #endif
 };
 

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- control.cpp	1 Feb 2004 21:10:26 -0000	1.26
+++ control.cpp	28 Feb 2004 12:58:13 -0000	1.27
@@ -179,7 +179,7 @@
 	}
 	palOut[0] = palOut[1] = palOut[2] = palOut[3] = 0;
 	_resMan->resClose(SR_PALETTE);
-	_system->set_palette(palOut, 0, 256);
+	_system->setPalette(palOut, 0, 256);
 	free(palOut);
 
 	File test;
@@ -195,7 +195,7 @@
 			renderText(textA, 320, 220, TEXT_CENTER);
 			renderText(_lStrings[STR_INSERT_CD_B], 320, 240, TEXT_CENTER);
 			_system->copy_rect(_screenBuf, 640, 0, 0, 640, 480);
-			_system->update_screen();
+			_system->updateScreen();
 		}
 		delay(300);
 		if (_keyPressed) {
@@ -204,7 +204,7 @@
 				memset(_screenBuf, 0, 640 * 480);
 				renderText(_lStrings[STR_INCORRECT_CD], 320, 230, TEXT_CENTER);
 				_system->copy_rect(_screenBuf, 640, 0, 0, 640, 480);
-				_system->update_screen();
+				_system->updateScreen();
 				delay(2000);
 				refreshText = true;
 			} else {
@@ -240,7 +240,7 @@
 	}
 	palOut[0] = palOut[1] = palOut[2] = palOut[3] = 0;
 	_resMan->resClose(SR_PALETTE);
-	_system->set_palette(palOut, 0, 256);
+	_system->setPalette(palOut, 0, 256);
 	free(palOut);
 	uint8 mode = 0, newMode = BUTTON_MAIN_PANEL;
 	bool fullRefresh = false;
@@ -281,7 +281,7 @@
 			fullRefresh = false;
 			_system->copy_rect(_screenBuf, SCREEN_WIDTH, 0, 0, SCREEN_WIDTH, 480);
 		}
-		_system->update_screen();
+		_system->updateScreen();
 		delay(1000 / 12);
 		newMode = getClicks(mode, &retVal);
 	} while ((newMode != 1) && (retVal == 0));
@@ -568,7 +568,7 @@
 	do {
 		buttons[0]->draw();
 		buttons[1]->draw();
-		_system->update_screen();
+		_system->updateScreen();
 		delay(1000 / 12);
 		if (_mouseState & BS1L_BUTTON_DOWN) {
 			if (buttons[0]->wasClicked(_mouseX, _mouseY))

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- music.cpp	14 Jan 2004 18:39:24 -0000	1.23
+++ music.cpp	28 Feb 2004 12:58:13 -0000	1.24
@@ -114,7 +114,7 @@
 	_system = system;
 	_mixer = pMixer;
 	_mixer->setupPremix(passMixerFunc, this);
-	_mutex = _system->create_mutex();
+	_mutex = _system->createMutex();
 	_converter[0] = NULL;
 	_converter[1] = NULL;
 	_volumeL = _volumeR = 192;
@@ -125,7 +125,7 @@
 	delete _converter[0];
 	delete _converter[1];
 	if (_mutex)
-		_system->delete_mutex(_mutex);
+		_system->deleteMutex(_mutex);
 }
 
 void Music::passMixerFunc(void *param, int16 *buf, uint len) {

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- screen.cpp	22 Feb 2004 16:31:32 -0000	1.39
+++ screen.cpp	28 Feb 2004 12:58:13 -0000	1.40
@@ -108,14 +108,14 @@
 		_fadingStep = 1;
 		_fadingDirection = FADE_UP;
 		memset(_currentPalette, 0, 256 * 4);
-		_system->set_palette(_currentPalette, 0, 256);
+		_system->setPalette(_currentPalette, 0, 256);
 	} else
-		_system->set_palette(_targetPalette + 4 * start, start, length);
+		_system->setPalette(_targetPalette + 4 * start, start, length);
 }
 
 void Screen::fullRefresh(void) {
 	_fullRefresh = true;
-	_system->set_palette(_targetPalette, 0, 256);
+	_system->setPalette(_targetPalette, 0, 256);
 }
 
 bool Screen::stillFading(void) {
@@ -133,7 +133,7 @@
 	uint16 avgScrlY = (uint16)(_oldScrollY + Logic::_scriptVars[SCROLL_OFFSET_Y]) / 2;
 
 	_system->copy_rect(_screenBuf + avgScrlY * _scrnSizeX + avgScrlX, _scrnSizeX, 0, 40, SCREEN_WIDTH, SCREEN_DEPTH);
-	_system->update_screen();
+	_system->updateScreen();
 	return true;
 }
 
@@ -147,7 +147,7 @@
 	}
 	if (_fadingStep) {
 		fadePalette();
-		_system->set_palette(_currentPalette, 0, 256);
+		_system->setPalette(_currentPalette, 0, 256);
 	}
 
 	uint16 scrlX = (uint16)Logic::_scriptVars[SCROLL_OFFSET_X];
@@ -241,7 +241,7 @@
 			scrnBuf += _scrnSizeX * SCRNGRID_Y;
 		}
 	}
-	_system->update_screen();
+	_system->updateScreen();
 }
 
 void Screen::newScreen(uint32 screen) {
@@ -956,7 +956,7 @@
 	}
 
 	_system->copy_rect(buf, width, (640-width)/2, (480-height)/2, width, height);
-	_system->update_screen();
+	_system->updateScreen();
 
 	free(buf);