cleanup, and fix bug in table

svn-id: r13389
This commit is contained in:
Paweł Kołodziejski 2004-03-27 18:12:18 +00:00
parent f6d131f6c6
commit 0974887290
2 changed files with 7 additions and 11 deletions

View File

@ -495,21 +495,17 @@ void IMuseDigital::parseScriptCmds(int a, int b, int c, int d, int e, int f, int
}
}
} else if ((_vm->_gameId == GID_CMI) && (_vm->_features & GF_DEMO)) {
fadeOutMusic(120);
if (b == 2) {
fadeOutMusic(120);
startMusic("in1.imx", 2002, 0, 127);
startMusic("in1.imx", 1100, 0, 127);
} else if (b == 4) {
fadeOutMusic(120);
startMusic("in2.imx", 2004, 0, 127);
startMusic("in2.imx", 1120, 0, 127);
} else if (b == 8) {
fadeOutMusic(120);
startMusic("out1.imx", 2008, 0, 127);
startMusic("out1.imx", 1140, 0, 127);
} else if (b == 9) {
fadeOutMusic(120);
startMusic("out2.imx", 2009, 0, 127);
startMusic("out2.imx", 1150, 0, 127);
} else if (b == 16) {
fadeOutMusic(120);
startMusic("gun.imx", 2016, 0, 127);
startMusic("gun.imx", 1210, 0, 127);
} else {
warning("imuse digital: set state unknown for cmi demo: %d, room: %d", b, _vm->_currentRoom);
}

View File

@ -152,7 +152,7 @@ const imuseRoomMap _digStateMusicMap[] = {
};
const imuseDigTable _digStateMusicTable[] = {
{0, 60, "STATE_NULL", 0, 0, ""},
{0, 1000, "STATE_NULL", 0, 0, ""},
{0, 1001, "stateNoChange", 0, 0, ""},
{3, 1100, "stateAstShip", 2, 0, "ASTERO~1.IMU"},
{3, 1120, "stateAstClose", 2, 0, "ASTERO~2.IMU"},