[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.1,2.2
Eugene Sandulenko
sev at users.sourceforge.net
Sat Oct 9 09:07:29 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.160,2.161 script_v80he.cpp,2.53,2.54
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.297,2.298 script_v100he.cpp,2.2,2.3 script_v7he.cpp,2.102,2.103 script_v90he.cpp,2.86,2.87
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31013
Modified Files:
script_v100he.cpp
Log Message:
Fix warning messages
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- script_v100he.cpp 9 Oct 2004 14:33:31 -0000 2.1
+++ script_v100he.cpp 9 Oct 2004 16:03:14 -0000 2.2
@@ -390,7 +390,7 @@
return;
}
- a = derefActorSafe(_curActor, "o72_actorOps");
+ a = derefActorSafe(_curActor, "o100_actorOps");
if (!a)
return;
@@ -447,7 +447,7 @@
for (i = 0; i < k; ++i) {
a->setUserCondition(args[i] & 0x7F, args[i] & 0x80);
}
- debug(1,"o72_actorOps: case 21 (%d)", k);
+ debug(1,"o100_actorOps: case 21 (%d)", k);
break;
case 25: // SO_COSTUME
a->setActorCostume(pop());
@@ -465,7 +465,7 @@
case 57: // SO_PALETTE
j = pop();
i = pop();
- checkRange(255, 0, i, "Illegal palette slot %d");
+ checkRange(255, 0, i, "o100_actorOps: Illegal palette slot %d");
a->remapActorPaletteColor(i, j);
break;
case 59:
@@ -481,7 +481,7 @@
break;
case 70: // SO_SHADOW
a->_shadowMode = pop();
- debug(0, "Set actor XMAP idx to %d", a->_shadowMode);
+ debug(0, "o100_actorOps: Set actor XMAP idx to %d", a->_shadowMode);
break;
case 74: // SO_STEP_DIST
j = pop();
@@ -564,7 +564,7 @@
k = pop();
a->talkUnk = 1;
a->setTalkCondition(k);
- debug(1,"o72_actorOps: case 24 (%d)", k);
+ debug(1,"o100_actorOps: case 24 (%d)", k);
break;
case 143: // SO_TEXT_OFFSET
a->talkPosY = pop();
@@ -609,7 +609,7 @@
len = getStackList(list, ARRAYSIZE(list));
id = readVar(array);
if (id == 0)
- error("Must DIM a two dimensional array before assigning");
+ error("o100_arrayOps: Must DIM a two dimensional array before assigning");
c = pop();
while (--len >= 0) {
writeArray(array, c, len, list[len]);
@@ -956,7 +956,7 @@
data = kStringArray;
break;
default:
- error("o90_dim2dim2Array: default case %d", type);
+ error("o100_dim2dim2Array: default case %d", type);
}
if (pop() == 2) {
@@ -1212,7 +1212,7 @@
pop();
break;
default:
- error("o90_unknown26: Unknown case %d", subOp);
+ error("o100_unknown26: Unknown case %d", subOp);
}
debug(1,"o100_unknown26 stub (%d)", subOp);
}
@@ -1277,7 +1277,7 @@
case 0x8A: // SO_CURSOR_SOFT_ON Turn soft cursor on
_cursor.state++;
if (_cursor.state > 1)
- error("Cursor state greater than 1 in script");
+ error("o100_cursorCommand: Cursor state greater than 1 in script");
break;
case 0x8B: // SO_CURSOR_SOFT_OFF Turn soft cursor off
_cursor.state--;
@@ -1306,7 +1306,7 @@
case 128: // SO_WAIT_FOR_ACTOR Wait for actor
offs = fetchScriptWordSigned();
actnum = pop();
- a = derefActor(actnum, "o6_wait:168");
+ a = derefActor(actnum, "o100_wait:168");
if (a->moving)
break;
return;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.160,2.161 script_v80he.cpp,2.53,2.54
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.297,2.298 script_v100he.cpp,2.2,2.3 script_v7he.cpp,2.102,2.103 script_v90he.cpp,2.86,2.87
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list