[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.38,1.39 screen.h,1.3,1.4

Oliver Kiehl olki at users.sourceforge.net
Wed May 28 14:30:13 CEST 2003


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

Modified Files:
	sky.cpp screen.h 
Log Message:
add screen update to main loop


Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- sky.cpp	28 May 2003 20:55:25 -0000	1.38
+++ sky.cpp	28 May 2003 21:29:50 -0000	1.39
@@ -145,6 +145,9 @@
 	while (1) {
 		delay(100);
 		_skyLogic->engine();
+		_skyScreen->recreate();
+		_skyScreen->spriteEngine();
+		_skyScreen->flip();
 	}
 }
 

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- screen.h	27 May 2003 16:42:20 -0000	1.3
+++ screen.h	28 May 2003 21:29:50 -0000	1.4
@@ -75,6 +75,11 @@
 	void fnDrawScreen(uint32 palette, uint32 scroll);
 	void clearScreen(void) { memset(_currentScreen, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT); };
 
+	void recreate(void);
+	void flip(void);
+
+	void spriteEngine(void);
+
 private:
 	OSystem *_system;
 	SkyDisk *_skyDisk;
@@ -108,14 +113,11 @@
     //- more regular screen.asm + layer.asm routines
 	void convertPalette(uint8 *inPal, uint8* outPal);
 	void palette_fadedown_helper(uint32 *pal, uint num);
-	void recreate(void);
-	void flip(void);
-
+	
 	//- sprite.asm routines
 	// fixme: get rid of these globals
 	uint32 _sprWidth, _sprHeight, _sprX, _sprY, _maskX1, _maskX2;
-	void spriteEngine(void);
-    void doSprites(uint8 layer);
+	void doSprites(uint8 layer);
 	void sortSprites(void);
 	void drawSprite(uint8 *spriteData, Compact *sprCompact);
 	void verticalMask(void);





More information about the Scummvm-git-logs mailing list