[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.55,1.56 scumm.h,1.322,1.323
Pawel Kolodziejski
aquadran at users.sourceforge.net
Mon Nov 17 11:01:18 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8292
Modified Files:
imuse_digi.cpp scumm.h
Log Message:
added music hacks for cmi demo, please test it
Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- imuse_digi.cpp 13 Nov 2003 10:51:01 -0000 1.55
+++ imuse_digi.cpp 17 Nov 2003 18:59:25 -0000 1.56
@@ -1030,7 +1030,6 @@
debug(5, "ImuseSetState (%d)", b);
if (_scumm->_gameId == GID_DIG) {
if (b == 1000) { // STATE_NULL
- // FIXME: Fade this out properly, in the same increments as the real engine
_scumm->_sound->stopBundleMusic();
return 0;
}
@@ -1048,9 +1047,26 @@
return 0;
}
}
+ } else if (_scumm->_gameId == GID_CMIDEMO) {
+ if (b == 1000) { // STATE_NULL
+ _scumm->_sound->stopBundleMusic();
+ return 0;
+ } else if (b == 1001)
+ _scumm->_sound->playBundleMusic("in1.imx");
+ else if (b == 1100)
+ _scumm->_sound->playBundleMusic("in2.imx");
+ else if (b == 1120)
+ _scumm->_sound->playBundleMusic("out1.imx");
+ else if (b == 1140)
+ _scumm->_sound->playBundleMusic("out2.imx");
+ else if (b == 1205)
+ _scumm->_sound->playBundleMusic("gun.imx");
+ else {
+ warning("imuse digital: set state unknown for cmi demo: %d", b);
+ return 1;
+ }
} else if (_scumm->_gameId == GID_CMI) {
if (b == 1000) { // STATE_NULL
- // FIXME: Fade this out properly, in the same increments as the real engine
_scumm->_sound->stopBundleMusic();
return 0;
}
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- scumm.h 13 Nov 2003 10:51:02 -0000 1.322
+++ scumm.h 17 Nov 2003 18:59:26 -0000 1.323
@@ -190,7 +190,8 @@
GID_PUTTPUTT,
GID_PJSDEMO,
GID_MONKEY_SEGA,
- GID_FTDEMO
+ GID_FTDEMO,
+ GID_CMIDEMO
};
#define _maxRooms res.num[rtRoom]
More information about the Scummvm-git-logs
mailing list