[Scummvm-cvs-logs] CVS: scummvm/sky introimg.cpp,NONE,1.1 cd_intro.cpp,1.8,1.9 module.mk,1.13,1.14 sky.h,1.26,1.27

Robert G?ffringmann lavosspawn at users.sourceforge.net
Thu May 29 15:27:29 CEST 2003


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

Modified Files:
	cd_intro.cpp module.mk sky.h 
Added Files:
	introimg.cpp 
Log Message:
Some sky CD versions have an image replaced. This includes the original sky01.gif into ScummVM. Disabled by default, though.

--- NEW FILE: introimg.cpp ---
#include "stdafx.h"
#include "sky/sky.h"

uint8 SkyState::fosterImg[297*143] = {
    0x16, 0x37, 0x37, 0x37, 0x16, 0x37, 0x37, 0x16, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x16, 0x37, 
    0x37, 0x37, 0x37, 0x37, 0x37, 0x16, 0x37, 0x37, 0x16, 0x37, 0x16, 0x37, 0x16, 0x37, 0x37, 0x37, 
    0x16, 0x37, 0x16, 0x37, 0x37, 0x37, 0x37, 0x16, 0x37, 0x37, 0x37, 0x16, 0x37, 0x16, 0x37, 0x37, 
    0x37, 0x30, 0x37, 0x30, 0x37, 0x37, 0x37, 0x30, 0x37, 0x37, 0x30, 0x37, 0x30, 0x37, 0x30, 0x37, 
    0x30, 0x37, 0x37, 0x37, 0x37, 0x30, 0x37, 0x30, 0x37, 0x37, 0x30, 0x37, 0x37, 0x30, 0x37, 0x3F, 
    0x37, 0x37, 0x37, 0x37, 0x37, 0x30, 0x37, 0x37, 0x30, 0x37, 0x30, 0x37, 0x37, 0x37, 0x30, 0x37, 
    0x37, 0x30, 0x37, 0x30, 0x37, 0x30, 0x37, 0x30, 0x37, 0x37, 0x37, 0x37, 0x30, 0x37, 0x30, 0x37, 
    0x37, 0x30, 0x37, 0x37, 0x30, 0x37, 0x3F, 0x37, 0x37, 0x37, 0x37, 0x37, 0x30, 0x37, 0x37, 0x30, 
    0x37, 0x30, 0x37, 0x37, 0x37, 0x30, 0x37, 0x37, 0x30, 0x37, 0x30, 0x37, 0x30, 0x37, 0x30, 0x37, 
    0x37, 0x37, 0x37, 0x30, 0x37, 0x30, 0x37, 0x08, 0xE8, 0x08, 0xE8, 0xE8, 0x6C, 0x9B, 0x3A, 0x6C, 
    0x00, 0xB9, 0x5C, 0x71, 0x70, 0x75, 0x6F, 0x72, 0x71, 0x5D, 0x86, 0xB0, 0xAF, 0xAF, 0xAF, 0xAF, 
    0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
    0xAF, 0xAF, 0xAF, 0xAF, 0xA5, 0x5C, 0x6F, 0x6F, 0x86, 0x70, 0x5D, 0x5D, 0x73, 0x6F, 0x6F, 0x5C, 
    0x71, 0x5D, 0x5D, 0x57, 0x6F, 0x6F, 0x54, 0x73, 0x5D, 0x5D, 0x7C, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
    0xAF, 0xAF, 0xAF, 0xB0, 0xB5, 0x93, 0x2B, 0xE8, 0x87, 0xDF, 0x75, 0x2B, 0x0D, 0x0D, 0x05, 0xE8, 
[...2679 lines suppressed...]
0x14, 0x10, 0x10, 0x12, 0x10, 0x10, 0x10, 0x10, 0x10, 0x06, 0x0E, 0x10, 0x21, 0x06,
0x10, 0x21, 0x18, 0x0E, 0x18, 0x16, 0x0E, 0x39, 0x14, 0x0E, 0x37, 0x14, 0x0E, 0x29,
0x14, 0x0E, 0x14, 0x14, 0x0E, 0x12, 0x14, 0x0E, 0x35, 0x12, 0x0E, 0x27, 0x12, 0x0E,
0x21, 0x12, 0x0E, 0x1C, 0x10, 0x0E, 0x14, 0x10, 0x0E, 0x0E, 0x0E, 0x0E, 0x33, 0x04,
0x0E, 0x1E, 0x1A, 0x0C, 0x18, 0x16, 0x0C, 0x14, 0x14, 0x0C, 0x12, 0x14, 0x0C, 0x12,
0x10, 0x0C, 0x12, 0x0E, 0x0C, 0x0A, 0x0C, 0x0C, 0x08, 0x0A, 0x0C, 0x1C, 0x06, 0x0C,
0x31, 0x2B, 0x0A, 0x23, 0x23, 0x0A, 0x25, 0x1E, 0x0A, 0x18, 0x16, 0x0A, 0x12, 0x12,
0x0A, 0x1A, 0x0E, 0x0A, 0x0E, 0x0C, 0x0A, 0x0C, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x23,
0x06, 0x0A, 0x2B, 0x00, 0x0A, 0x39, 0x33, 0x08, 0x21, 0x1C, 0x08, 0x14, 0x14, 0x08,
0x14, 0x0A, 0x08, 0x08, 0x08, 0x08, 0x31, 0x00, 0x08, 0x25, 0x00, 0x08, 0x37, 0x2D,
0x06, 0x2B, 0x25, 0x06, 0x0C, 0x08, 0x06, 0x06, 0x06, 0x06, 0x14, 0x02, 0x06, 0x1C,
0x00, 0x06, 0x33, 0x2B, 0x04, 0x3B, 0x31, 0x02, 0x12, 0x14, 0x02, 0x02, 0x02, 0x02,
0x3F, 0x37, 0x00, 0x3F, 0x31, 0x00, 0x3D, 0x31, 0x00, 0x39, 0x2F, 0x00, 0x31, 0x2B,
0x00, 0x2F, 0x25, 0x00, 0x25, 0x21, 0x00, 0x3F, 0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x26, 0x26, 0x3F, 0x3F,
0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36,
0x36, 0x36, 0x2D, 0x2F, 0x31, 0x20, 0x1F, 0x29, 0x1D, 0x17, 0x25, 0x17, 0x12, 0x1E,
0x31, 0x0B, 0x0B, 0x27, 0x05, 0x05, 0x1D, 0x01, 0x01, 0x3F, 0x3F, 0x3F
};

Index: cd_intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/cd_intro.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cd_intro.cpp	14 May 2003 22:33:38 -0000	1.8
+++ cd_intro.cpp	29 May 2003 22:26:45 -0000	1.9
@@ -199,6 +199,8 @@
 #define WAIT_SEQUENCE while (_skyScreen->sequenceRunning()) { delay(50); CHECK_ESC }
 #define WAIT_RELATIVE(x)	( delay(20 * (x)) )
 
+#define NORMAL_CD_INTRO
+
 void SkyState::doCDIntro() {
 
 	uint32 loadedVocSize, bgVocSize;
@@ -595,15 +597,24 @@
 	WAIT_VOICE; //54
 	START_VOICE; //55
 
+#ifdef NORMAL_CD_INTRO
 	_skyDisk->prefetchFile(cd_55_pal);
 	_skyDisk->prefetchFile(cd_55_log);
+#endif
 	LOAD_NEW_VOICE(cdv_56);
 	WAIT_VOICE; //55
 	START_VOICE; //56
 
 	_skyScreen->fnFadeDown(0);
-	_skyScreen->showScreen(cd_55_log);
+#ifdef NORMAL_CD_INTRO
+	_skyScreen->showScreen(cd_55_log);  // foster screen
 	_skyScreen->paletteFadeUp(cd_55_pal);
+#else
+	memset(_skyScreen->giveCurrent(), 0, 320*200);
+	_system->copy_rect(_skyScreen->giveCurrent(), 320, 0, 0, 320, 200);
+	_system->copy_rect(fosterImg, 297, 11, 28, 297, 143);
+	_skyScreen->paletteFadeUp(fosterPal);
+#endif
 
 	LOAD_NEW_VOICE(cdv_57);
 	WAIT_VOICE; //56

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/module.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- module.mk	28 May 2003 23:44:11 -0000	1.13
+++ module.mk	29 May 2003 22:26:45 -0000	1.14
@@ -15,6 +15,7 @@
 	sky/sky.o \
 	sky/sound.o \
 	sky/text.o \
+	sky/introimg.cpp \
 	sky/music/adlibchannel.o \
 	sky/music/adlibmusic.o \
 	sky/music/gmchannel.o \

Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sky.h	28 May 2003 23:31:43 -0000	1.26
+++ sky.h	29 May 2003 22:26:45 -0000	1.27
@@ -113,6 +113,8 @@
 	void go();
 
 	//intro related
+	static uint8 fosterImg[297 * 143];
+	static uint8 fosterPal[256 * 3];
 	void checkCommands(uint32 *&cmdPtr);
 	void introFrame(uint8 **diffPtr, uint8 **vgaPtr, uint8 *screenData);
 





More information about the Scummvm-git-logs mailing list