[Scummvm-cvs-logs] CVS: scummvm insane.cpp,1.42,1.43

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv9666

Modified Files:
	insane.cpp 
Log Message:
Allow Full Thottle SMUSH to work again



Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- insane.cpp	12 Jul 2002 05:25:32 -0000	1.42
+++ insane.cpp	12 Jul 2002 15:29:22 -0000	1.43
@@ -1074,8 +1074,8 @@
 		if (_saudSize[idx] == 0) {
 			tag = READ_BE_UINT32(_cur + pos);
 			pos += 4;
-			if (tag != 'SAUD')
-				error("trk %d: SAUD tag not found", trk);
+			if (tag != 'SAUD') // FIXME: DIG specific?
+				warning("trk %d: SAUD tag not found", trk);
 			_saudSize[idx] = READ_BE_UINT32(_cur + pos);
 			pos += 4;
 		}
@@ -1117,8 +1117,8 @@
 		case 'SHDR':
 			/* FIXME: what is this stuff ? */
 			break;
-		default:
-			error("trk %d: unknown tag inside PSAD", trk);
+		default: // FIXME: Add FT tags
+			warning("trk %d: unknown tag inside PSAD", trk);
 		}
 		_saudSubSize[idx] -= sublen;
 		_saudSize[idx] -= sublen;
@@ -1128,6 +1128,12 @@
 
 void SmushPlayer::parseTRES()
 {
+       // FIXME: Doesn't work for Full Throttle
+       if (sm->_gameId != GID_DIG) {  
+               printf("getStringTRES(%d)\n", READ_LE_UINT16(_cur + 16));
+               return;
+       }
+
 	byte * txt = getStringTRES (READ_LE_UINT16(_cur + 16));
 	drawStringTRES (READ_LE_UINT16(_cur), READ_LE_UINT16(_cur + 2), txt);
 	if (txt != NULL)