[Scummvm-cvs-logs] CVS: scummvm/sky screen.cpp,1.14,1.15 screen.h,1.4,1.5 sky.cpp,1.41,1.42

Robert G?ffringmann lavosspawn at users.sourceforge.net
Wed May 28 20:27:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv12069/sky

Modified Files:
	screen.cpp screen.h sky.cpp 
Log Message:
removed debugging stuff

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- screen.cpp	29 May 2003 03:19:46 -0000	1.14
+++ screen.cpp	29 May 2003 03:26:28 -0000	1.15
@@ -593,8 +593,6 @@
 	for (uint8 cnty = 0; cnty < _sprHeight; cnty++) {
 		for (uint8 cntx = 0; cntx < _sprWidth; cntx++)
 			if (spriteData[cntx + _maskX1]) screenPtr[cntx] = spriteData[cntx + _maskX1];
-		_system->copy_rect(screenPtr,320,_sprX + _maskX1, _sprY + cnty, _sprWidth, 1);
-		_system->update_screen();
 		spriteData += _sprWidth;
 		screenPtr += GAME_SCREEN_WIDTH;
 	}

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- screen.h	28 May 2003 21:29:50 -0000	1.4
+++ screen.h	29 May 2003 03:26:28 -0000	1.5
@@ -51,7 +51,6 @@
 public:
 	SkyScreen(OSystem *pSystem, SkyDisk *pDisk);
 	~SkyScreen(void);
-//	void takeScriptVars(uint32 *pScriptVars) { _scriptVariables = pScriptVars; };
 	void setPalette(uint8 *pal);
 	void setPalette(uint16 fileNum);
 	void paletteFadeUp(uint8 *pal);

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- sky.cpp	29 May 2003 03:19:46 -0000	1.41
+++ sky.cpp	29 May 2003 03:26:28 -0000	1.42
@@ -147,6 +147,7 @@
 		_skyLogic->engine();
 		_skyScreen->spriteEngine();
 		_skyScreen->flip();
+		_skyScreen->showScreen(_skyScreen->giveCurrent());
 	}
 }
 
@@ -336,7 +337,7 @@
 }
 
 bool SkyState::isCDVersion(uint32 version) {
-return false;
+
 	switch (version) {
 	case 267:
 		return false;





More information about the Scummvm-git-logs mailing list