[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.51,1.52
Jonathan Gray
khalek at users.sourceforge.net
Tue Apr 29 02:15:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv28248
Modified Files:
script_v5.cpp
Log Message:
patch #729365 indy3 intro fix by erik
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- script_v5.cpp 28 Apr 2003 18:35:27 -0000 1.51
+++ script_v5.cpp 29 Apr 2003 09:14:05 -0000 1.52
@@ -642,9 +642,18 @@
initCharset(getVarOrDirectByte(0x80));
break;
case 14: /* unk */
- getWordVararg(table);
- for (i = 0; i < 16; i++)
- _charsetColorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)table[i];
+ if (_gameId == GID_INDY3 || _gameId == GID_INDY3_256) {
+ // FIXME: What is this supposed to do? From comparing
+ // Indy3's script 118 to the Passport Demo's script 58
+ // my guess is that it's some sort of "init charset",
+ // but why does it need two parameters?
+ getVarOrDirectByte(0x80);
+ getVarOrDirectByte(0x40);
+ } else {
+ getWordVararg(table);
+ for (i = 0; i < 16; i++)
+ _charsetColorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)table[i];
+ }
break;
}
@@ -1303,11 +1312,6 @@
int room;
room = getVarOrDirectByte(0x80);
-
- // FIXME nasty hack to make indy have right costume
- if ( ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) &&
- (_currentRoom == 6) && (_currentScript == 1))
- _actors[1].setActorCostume(10);
// For small header games, we only call startScene if the room
// actually changed. This avoid unwanted (wrong) fades in Zak256
More information about the Scummvm-git-logs
mailing list