[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.172,1.173
Max Horn
fingolfin at users.sourceforge.net
Fri Sep 5 13:48:02 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv30781
Modified Files:
script_v5.cpp
Log Message:
made default case outputs a bit more consistent
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- script_v5.cpp 5 Sep 2003 07:36:05 -0000 1.172
+++ script_v5.cpp 5 Sep 2003 20:47:23 -0000 1.173
@@ -771,7 +771,8 @@
xpos = getVarOrDirectWord(0x40);
ypos = getVarOrDirectWord(0x20);
} else {
- switch ((_opcode = fetchScriptByte()) & 0x1F) {
+ _opcode = fetchScriptByte();
+ switch (_opcode & 0x1F) {
case 1: /* draw at */
xpos = getVarOrDirectWord(0x80);
ypos = getVarOrDirectWord(0x40);
@@ -782,7 +783,7 @@
case 0x1F: /* neither */
break;
default:
- error("o5_drawObject: default case");
+ error("o5_drawObject: unknown subopcode %d", _opcode & 0x1F);
}
}
@@ -1623,7 +1624,7 @@
shutDown();
break;
default:
- error("o5_quitPauseRestart invalid case %d", subOp);
+ error("o5_quitPauseRestart: unknown subopcode %d", subOp);
}
}
@@ -2000,7 +2001,7 @@
}
break;
default:
- error("o5_saveRestoreVerbs: invalid opcode");
+ error("o5_saveRestoreVerbs: unknown subopcode %d", _opcode);
}
}
@@ -2467,14 +2468,6 @@
vs->type = kTextVerbType;
vs->imgindex = 0;
break;
- case 21: /* unk in loomcd */
- warning("VerbOps case 21, please report where this occured");
- // TODO Work out exactly which vars are set.
- fetchScriptByte();
- fetchScriptByte();
- fetchScriptByte();
- fetchScriptByte();
- break;
case 22: /* assign object */
a = getVarOrDirectWord(0x80);
b = getVarOrDirectByte(0x40);
@@ -2487,6 +2480,8 @@
case 23: /* set back color */
vs->bkcolor = getVarOrDirectByte(0x80);
break;
+ default:
+ error("o5_verbOps: unknown subopcode %d", _opcode & 0x1F);
}
}
drawVerb(slot, 0);
@@ -2526,7 +2521,7 @@
return;
break;
default:
- error("o5_wait: default case");
+ error("o5_wait: unknown subopcode %d", _opcode & 0x1F);
return;
}
More information about the Scummvm-git-logs
mailing list