[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.92,2.93 saveload.cpp,1.74,1.75 script.cpp,1.99,1.100 script_v2.cpp,2.108,2.109 script_v5.cpp,1.94,1.95 scumm.h,1.208,1.209 vars.cpp,1.54,1.55
Max Horn
fingolfin at users.sourceforge.net
Thu May 22 07:33:04 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13247
Modified Files:
intern.h saveload.cpp script.cpp script_v2.cpp script_v5.cpp
scumm.h vars.cpp
Log Message:
from the MM/Zak scripts, the code etc. it's clear that unk2 is the sentence preposition
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.92
retrieving revision 2.93
diff -u -d -r2.92 -r2.93
--- intern.h 21 May 2003 14:25:13 -0000 2.92
+++ intern.h 22 May 2003 14:10:16 -0000 2.93
@@ -240,7 +240,7 @@
void o2_getActorX();
void o2_getActorY();
void o2_getBitVar();
- void o2_getObjUnknown();
+ void o2_getObjPreposition();
void o2_ifClassOfIs();
void o2_ifNotState01();
void o2_ifNotState02();
@@ -264,7 +264,7 @@
void o2_setBitVar();
void o2_setCameraAt();
void o2_setObjectName();
- void o2_setObjUnknown();
+ void o2_setObjPreposition();
void o2_setOwnerOf();
void o2_setState01();
void o2_setState02();
@@ -282,6 +282,7 @@
byte VAR_SENTENCE_VERB;
byte VAR_SENTENCE_OBJECT1;
byte VAR_SENTENCE_OBJECT2;
+ byte VAR_SENTENCE_PREPOSITION;
byte VAR_BACKUP_VERB;
};
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- saveload.cpp 22 May 2003 09:58:32 -0000 1.74
+++ saveload.cpp 22 May 2003 14:10:17 -0000 1.75
@@ -532,7 +532,7 @@
const SaveLoadEntry sentenceTabEntries[] = {
MKLINE(SentenceTab, verb, sleUint8, VER_V8),
- MKLINE(SentenceTab, unk2, sleUint8, VER_V8),
+ MKLINE(SentenceTab, preposition, sleUint8, VER_V8),
MKLINE(SentenceTab, objectA, sleUint16, VER_V8),
MKLINE(SentenceTab, objectB, sleUint16, VER_V8),
MKLINE(SentenceTab, freezeCount, sleUint8, VER_V8),
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- script.cpp 21 May 2003 23:54:39 -0000 1.99
+++ script.cpp 22 May 2003 14:10:17 -0000 1.100
@@ -818,7 +818,7 @@
st->verb = verb;
st->objectA = objectA;
st->objectB = objectB;
- st->unk2 = (objectB & 0xFF00) != 0;
+ st->preposition = (objectB & 0xFF00) != 0;
st->freezeCount = 0;
}
@@ -845,7 +845,7 @@
_sentenceNum--;
if (!(_features & GF_AFTER_V7))
- if (_sentence[_sentenceNum].unk2 && _sentence[_sentenceNum].objectB == _sentence[_sentenceNum].objectA)
+ if (_sentence[_sentenceNum].preposition && _sentence[_sentenceNum].objectB == _sentence[_sentenceNum].objectA)
return;
if (_features & GF_AFTER_V2) {
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.108
retrieving revision 2.109
diff -u -d -r2.108 -r2.109
--- script_v2.cpp 22 May 2003 13:57:34 -0000 2.108
+++ script_v2.cpp 22 May 2003 14:10:18 -0000 2.109
@@ -46,7 +46,7 @@
OPCODE(o5_isNotEqual),
OPCODE(o5_faceActor),
OPCODE(o2_assignVarWordIndirect),
- OPCODE(o2_setObjUnknown),
+ OPCODE(o2_setObjPreposition),
/* 0C */
OPCODE(o2_resourceRoutines),
OPCODE(o5_walkActorToActor),
@@ -126,7 +126,7 @@
OPCODE(o5_isEqual),
OPCODE(o5_faceActor),
OPCODE(o2_chainScript),
- OPCODE(o2_setObjUnknown),
+ OPCODE(o2_setObjPreposition),
/* 4C */
OPCODE(o2_waitForSentence),
OPCODE(o5_walkActorToActor),
@@ -168,7 +168,7 @@
OPCODE(o2_subIndirect),
OPCODE(o2_dummy),
/* 6C */
- OPCODE(o2_getObjUnknown),
+ OPCODE(o2_getObjPreposition),
OPCODE(o5_putActorInRoom),
OPCODE(o2_dummy),
OPCODE(o2_ifState04),
@@ -206,7 +206,7 @@
OPCODE(o5_isNotEqual),
OPCODE(o5_faceActor),
OPCODE(o2_assignVarWordIndirect),
- OPCODE(o2_setObjUnknown),
+ OPCODE(o2_setObjPreposition),
/* 8C */
OPCODE(o2_resourceRoutines),
OPCODE(o5_walkActorToActor),
@@ -286,7 +286,7 @@
OPCODE(o5_isEqual),
OPCODE(o5_faceActor),
OPCODE(o2_chainScript),
- OPCODE(o2_setObjUnknown),
+ OPCODE(o2_setObjPreposition),
/* CC */
OPCODE(o5_pseudoRoom),
OPCODE(o5_walkActorToActor),
@@ -328,7 +328,7 @@
OPCODE(o2_subIndirect),
OPCODE(o2_dummy),
/* EC */
- OPCODE(o2_getObjUnknown),
+ OPCODE(o2_getObjPreposition),
OPCODE(o5_putActorInRoom),
OPCODE(o2_dummy),
OPCODE(o2_ifState04),
@@ -512,7 +512,7 @@
setResult(fetchScriptByte());
}
-void Scumm_v2::o2_setObjUnknown() {
+void Scumm_v2::o2_setObjPreposition() {
int obj = getVarOrDirectWord(0x80);
int unk = fetchScriptByte();
@@ -522,7 +522,7 @@
}
}
-void Scumm_v2::o2_getObjUnknown() {
+void Scumm_v2::o2_getObjPreposition() {
getResultPos();
int obj = getVarOrDirectWord(0x80);
@@ -859,7 +859,7 @@
st->verb = a;
st->objectA = getVarOrDirectWord(0x40);
st->objectB = getVarOrDirectWord(0x20);
- st->unk2 = (st->objectB != 0);
+ st->preposition = (st->objectB != 0);
st->freezeCount = 0;
// TODO
@@ -1363,5 +1363,5 @@
VAR(VAR_SENTENCE_VERB) = VAR(VAR_BACKUP_VERB);
VAR(VAR_SENTENCE_OBJECT1) = 0;
VAR(VAR_SENTENCE_OBJECT2) = 0;
- _scummVars[29] = 0;
+ VAR(VAR_SENTENCE_PREPOSITION) = 0;
}
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- script_v5.cpp 22 May 2003 09:58:32 -0000 1.94
+++ script_v5.cpp 22 May 2003 14:10:19 -0000 1.95
@@ -749,7 +749,7 @@
st->verb = a;
st->objectA = getVarOrDirectWord(0x40);
st->objectB = getVarOrDirectWord(0x20);
- st->unk2 = (st->objectB != 0);
+ st->preposition = (st->objectB != 0);
st->freezeCount = 0;
}
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- scumm.h 21 May 2003 18:09:48 -0000 1.208
+++ scumm.h 22 May 2003 14:10:19 -0000 1.209
@@ -218,7 +218,7 @@
struct SentenceTab {
byte verb;
- byte unk2;
+ byte preposition;
uint16 objectA;
uint16 objectB;
uint8 freezeCount;
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- vars.cpp 21 May 2003 14:00:19 -0000 1.54
+++ vars.cpp 22 May 2003 14:10:20 -0000 1.55
@@ -123,6 +123,7 @@
VAR_SENTENCE_VERB = 26;
VAR_SENTENCE_OBJECT1 = 27;
VAR_SENTENCE_OBJECT2 = 28;
+ VAR_SENTENCE_PREPOSITION = 29;
VAR_VIRT_MOUSE_X = 30;
VAR_VIRT_MOUSE_Y = 31;
VAR_CLICK_AREA = 32;
More information about the Scummvm-git-logs
mailing list