[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.129,1.130

Jonathan Gray khalek at users.sourceforge.net
Sat Jul 12 19:26:10 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv19778

Modified Files:
	script_v5.cpp 
Log Message:
consistent case statement options, and make warnings more useful

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- script_v5.cpp	6 Jul 2003 06:36:26 -0000	1.129
+++ script_v5.cpp	13 Jul 2003 02:25:36 -0000	1.130
@@ -1592,33 +1592,33 @@
 		loadFlObject(getVarOrDirectWord(0x40), resid);
 		break;
 
-	case 0x1F + 1:
+	case 32:
 		// TODO
-		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode,  vm.slot[_currentScript].number);
+		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F,  vm.slot[_currentScript].number);
 		break;
-	case 0x20 + 1:
+	case 33:
 		// TODO
-		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode,  vm.slot[_currentScript].number);
+		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F,  vm.slot[_currentScript].number);
 		break;
-	case 0x22 + 1:
+	case 35:
 		// TODO
 		foo = getVarOrDirectByte(0x40);
-		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode,  vm.slot[_currentScript].number);
+		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F,  vm.slot[_currentScript].number);
 		break;
-	case 0x23 + 1:
+	case 36:
 		// TODO
 		foo = getVarOrDirectByte(0x40);
 		bar = fetchScriptByte();
-		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode,  vm.slot[_currentScript].number);
+		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F,  vm.slot[_currentScript].number);
 		break;
-	case 0x24 + 1:
+	case 37:
 		// TODO
 		foo = getVarOrDirectByte(0x40);
-		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode,  vm.slot[_currentScript].number);
+		warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F,  vm.slot[_currentScript].number);
 		break;
 
 	default:
-		warning("Unknown o5_resourceRoutines: %d", _opcode);
+		warning("Unknown o5_resourceRoutines: %d", _opcode & 0x3F);
 		break;
 	}
 }





More information about the Scummvm-git-logs mailing list