aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-10-12 05:54:18 +0000
committerTravis Howell2006-10-12 05:54:18 +0000
commit929375ae21f92ef1b56908aba92ac6ca4563526f (patch)
tree526debc61eb96138c0fe3bb53333f527bbf41333
parent71b0add6017fc3d9a29a27d8e29d7492a2c7510d (diff)
downloadscummvm-rg350-929375ae21f92ef1b56908aba92ac6ca4563526f.tar.gz
scummvm-rg350-929375ae21f92ef1b56908aba92ac6ca4563526f.tar.bz2
scummvm-rg350-929375ae21f92ef1b56908aba92ac6ca4563526f.zip
Fix mistake in debug opcode table for Elvira 1
svn-id: r24283
-rw-r--r--engines/agos/debug.h2
-rw-r--r--engines/agos/items.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/agos/debug.h b/engines/agos/debug.h
index 5aafae15ee..179e02805a 100644
--- a/engines/agos/debug.h
+++ b/engines/agos/debug.h
@@ -95,7 +95,7 @@ static const char *const elvira1_opcodeNameTable[300] = {
/* 52 */
NULL,
NULL,
- "IWV|COPY_OF",
+ "IWW|COPY_OF",
"WIW|COPY_FO",
/* 56 */
"WW|MOVE",
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index f41ac43f2f..c5ac944290 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.cpp
@@ -1874,12 +1874,12 @@ void AGOSEngine::oe1_whatO() {
void AGOSEngine::oe1_weigh() {
// 59: weight
Item *item = getNextItemPtr();
- writeVariable(getVarOrWord(), weighUp(item));
+ writeNextVarContents(weighUp(item));
}
void AGOSEngine::oe1_setFF() {
// 60: set FF
- writeNextVarContents(0xFF);
+ writeNextVarContents(255);
}
void AGOSEngine::oe1_moveDirn() {
@@ -2005,7 +2005,6 @@ void AGOSEngine::oe1_doorExit() {
int16 f = getVarOrWord();
int16 ct = 0;
-
c = (SubUserChain *)findChildOfType(d, 8);
if (c)
a = derefItem(c->chChained);