[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.35,1.36 screen.cpp,1.52,1.53 screen.h,1.19,1.20

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


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

Modified Files:
	animation.cpp screen.cpp screen.h 
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/sword1/animation.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- animation.cpp	6 Mar 2005 14:12:40 -0000	1.35
+++ animation.cpp	11 Mar 2005 15:30:26 -0000	1.36
@@ -48,7 +48,7 @@
 
 void AnimationState::drawYUV(int width, int height, byte *const *dat) {
 #ifdef BACKEND_8BIT
-	_scr->plotYUV(lut, width, height, dat);
+	_scr->plotYUV(_lut, width, height, dat);
 #else
 	plotYUV(width, height, dat);
 #endif
@@ -56,7 +56,7 @@
 
 void AnimationState::updateScreen(void) {
 #ifndef BACKEND_8BIT
-	_sys->copyRectToOverlay(overlay, MOVIE_WIDTH, 0, 40, MOVIE_WIDTH, MOVIE_HEIGHT);
+	_sys->copyRectToOverlay(_overlay, _movieWidth, 0, 40, _movieWidth, _movieHeight);
 #endif
 	_sys->updateScreen();
 }
@@ -65,12 +65,12 @@
 #ifdef BACKEND_8BIT
 	return NULL;
 #else
-	return overlay;
+	return _overlay;
 #endif
 }
 
 bool AnimationState::soundFinished(void) {
-	return !bgSound.isActive();
+	return !_bgSound.isActive();
 }
 
 AudioStream *AnimationState::createAudioStream(const char *name, void *arg) {

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- screen.cpp	11 Mar 2005 11:06:45 -0000	1.52
+++ screen.cpp	11 Mar 2005 15:30:26 -0000	1.53
@@ -32,6 +32,10 @@
 #include "sword1/menu.h"
 #include "sword1/sword1.h"
 
+#ifdef BACKEND_8BIT
+#include "sword1/animation.h"
+#endif
+
 #if defined(__PALM_OS__)
 #include "arm/native.h"
 #include "arm/macros.h"

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- screen.h	1 Jan 2005 16:09:25 -0000	1.19
+++ screen.h	11 Mar 2005 15:30:26 -0000	1.20
@@ -95,8 +95,6 @@
 	void plotYUV(byte *lut, int width, int height, byte *const *dat);
 #endif
 
-
-
 private:
 	// for router debugging
 	void drawLine(uint16 x1, uint16 y1, uint16 x2, uint16 y2);





More information about the Scummvm-git-logs mailing list