[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.57,1.58 render.cpp,1.72,1.73

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Fri Mar 11 07:30:56 CET 2005


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22054/sword2/driver

Modified Files:
	animation.cpp render.cpp 
Log Message:
Renamed variables in the MPEG animation classes to better conform with
ScummVM standard. It seems the 8-bit version of the code had decayed
slightly, but I believe it's working again now.


Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- animation.cpp	9 Mar 2005 18:12:53 -0000	1.57
+++ animation.cpp	11 Mar 2005 15:30:27 -0000	1.58
@@ -51,7 +51,7 @@
 #else
 
 void AnimationState::drawTextObject(SpriteInfo *s, byte *src) {
-	OverlayColor *dst = overlay + RENDERWIDE * (s->y) + s->x;
+	OverlayColor *dst = _overlay + RENDERWIDE * s->y + s->x;
 
 	// FIXME: These aren't the "right" colours, but look good to me.
 
@@ -78,31 +78,31 @@
 
 #endif
 
-void AnimationState::clearScreen(void) {
+void AnimationState::clearScreen() {
 #ifdef BACKEND_8BIT
-	memset(_vm->_screen->getScreen(), 0, MOVIE_WIDTH * MOVIE_HEIGHT);
+	memset(_vm->_screen->getScreen(), 0, _movieWidth * _movieHeight);
 #else
 	OverlayColor black = _sys->RGBToColor(0, 0, 0);
 
-	for (int i = 0; i < MOVIE_WIDTH * MOVIE_HEIGHT; i++)
-		overlay[i] = black;
+	for (int i = 0; i < _movieWidth * _movieHeight; i++)
+		_overlay[i] = black;
 #endif
 }
 
-void AnimationState::updateScreen(void) {
+void AnimationState::updateScreen() {
 #ifdef BACKEND_8BIT
-	byte *buf = _vm->_screen->getScreen() + ((480 - MOVIE_HEIGHT) / 2) * RENDERWIDE + (640 - MOVIE_WIDTH) / 2;
+	byte *buf = _vm->_screen->getScreen() + ((480 - _movieHeight) / 2) * RENDERWIDE + (640 - _movieWidth) / 2;
 
-	_vm->_system->copyRectToScreen(buf, MOVIE_WIDTH, (640 - MOVIE_WIDTH) / 2, (480 - MOVIE_HEIGHT) / 2, MOVIE_WIDTH, MOVIE_HEIGHT);
+	_vm->_system->copyRectToScreen(buf, _movieWidth, (640 - _movieWidth) / 2, (480 - _movieHeight) / 2, _movieWidth, _movieHeight);
 #else
-	_sys->copyRectToOverlay(overlay, MOVIE_WIDTH, 0, 0, MOVIE_WIDTH, MOVIE_HEIGHT);
+	_sys->copyRectToOverlay(_overlay, _movieWidth, 0, 0, _movieWidth, _movieHeight);
 #endif
 	_vm->_system->updateScreen();
 }
 
 void AnimationState::drawYUV(int width, int height, byte *const *dat) {
 #ifdef BACKEND_8BIT
-	_vm->_screen->plotYUV(lut, width, height, dat);
+	_vm->_screen->plotYUV(_lut, width, height, dat);
 #else
 	plotYUV(width, height, dat);
 #endif
@@ -241,12 +241,12 @@
 		return;
 	}
 
-#ifndef BACKEND_8BIT
 	// Clear the screen, because whatever is on it will be visible when the
-	// overlay is removed.
+	// overlay is removed. And if there isn't an overlay, we don't want it
+	// to be visible during the cutscene. (Not all cutscenes cover the
+	// entire screen.)
 	_vm->_screen->clearScene();
 	_vm->_screen->updateDisplay();
-#endif
 
 #ifndef SCUMM_BIG_ENDIAN
 	flags |= SoundMixer::FLAG_LITTLE_ENDIAN;

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- render.cpp	27 Feb 2005 16:11:19 -0000	1.72
+++ render.cpp	11 Mar 2005 15:30:28 -0000	1.73
@@ -24,7 +24,10 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/build_display.h"
+
+#ifdef BACKEND_8BIT
 #include "sword2/driver/animation.h"
+#endif
 
 namespace Sword2 {
 





More information about the Scummvm-git-logs mailing list