[Scummvm-cvs-logs] CVS: tools descumm-tool.cpp,1.14,1.15

Eugene Sandulenko sev at users.sourceforge.net
Fri Sep 9 07:27:30 CEST 2005


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2722

Modified Files:
	descumm-tool.cpp 
Log Message:
oops. this part of the patch was rejected.


Index: descumm-tool.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm-tool.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- descumm-tool.cpp	6 Sep 2005 01:22:23 -0000	1.14
+++ descumm-tool.cpp	9 Sep 2005 14:26:32 -0000	1.15
@@ -294,13 +294,30 @@
 			mem += 12;
 			break;											/* Local script */
 		case 'LSCR':
+		case 'LSC2':
+			if (size_of_code < 13) {
+				printf("File too small to be a local script\n");
+			}
+			printf("Script# %d\n", TO_LE_32(*((int32 *)(mem+8))));
+			mem += 12;
+			break;											/* Local script */
+		case 'LSCR':
 			if (scriptVersion == 8) {
+				if (size_of_code < 13) {
+					printf("File too small to be a local script\n");
+				}
 				printf("Script# %d\n", TO_LE_32(*((int32 *)(mem+8))));
 				mem += 12;
 			} else if (scriptVersion == 7) {
+				if (size_of_code < 11) {
+					printf("File too small to be a local script\n");
+				}
 				printf("Script# %d\n", TO_LE_16(*((int16 *)(mem+8))));
 				mem += 10;
 			} else {
+				if (size_of_code < 10) {
+					printf("File too small to be a local script\n");
+ 				}
 				printf("Script# %d\n", (byte)mem[8]);
 				mem += 9;
 			}





More information about the Scummvm-git-logs mailing list