[Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.28,1.29 sky.cpp,1.76,1.77 sky.h,1.37,1.38
Joost Peters
joostp at users.sourceforge.net
Fri Jul 4 17:56:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv2513/sky
Modified Files:
intro.cpp sky.cpp sky.h
Log Message:
applied eriktorbjorn's floppy-intro-with-cd-version patch (#765885)
Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- intro.cpp 4 Jul 2003 20:14:11 -0000 1.28
+++ intro.cpp 5 Jul 2003 00:55:20 -0000 1.29
@@ -205,6 +205,9 @@
uint32 *commandPtr = (uint32 *)zeroCommands;
+ if (!isCDVersion())
+ _floppyIntro = true;
+
_skyDisk->prefetchFile(60112); // revolution screen
_skyDisk->prefetchFile(60113); // revolution palette
@@ -214,7 +217,7 @@
escDelay(3000); //keep virgin screen up for 3 seconds
CHECK_ESC
- if (!isCDVersion())
+ if (_floppyIntro)
_skyMusic->startMusic(1);
escDelay(3000); //and another 3 seconds.
@@ -242,7 +245,7 @@
_skyScreen->paletteFadeUp(60115);
- if (isCDVersion()) {
+ if (!_floppyIntro) {
return doCDIntro();
} else {
_skyDisk->prefetchFile(FN_A_PAL);
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- sky.cpp 4 Jul 2003 23:26:46 -0000 1.76
+++ sky.cpp 5 Jul 2003 00:55:20 -0000 1.77
@@ -88,6 +88,8 @@
_systemVars.language = detector->_language;
_detector = detector;
+ _floppyIntro = detector->_floppyIntro;
+
_introTextSpace = 0;
_introTextSave = 0;
}
Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- sky.h 2 Jul 2003 01:46:25 -0000 1.37
+++ sky.h 5 Jul 2003 00:55:20 -0000 1.38
@@ -65,6 +65,8 @@
byte *_introTextSpace;
byte *_introTextSave;
+ bool _floppyIntro;
+
uint16 _debugMode;
uint16 _debugLevel;
bool _paintGrid;
More information about the Scummvm-git-logs
mailing list