[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.169,1.170 script_v5.cpp,1.48,1.49 script_v2.cpp,2.29,2.30 script.cpp,1.66,1.67 saveload.cpp,1.58,1.59
Jonathan Gray
khalek at users.sourceforge.net
Sun Apr 27 20:14:25 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3779
Modified Files:
scumm.h script_v5.cpp script_v2.cpp script.cpp saveload.cpp
Log Message:
get rid of one of the obscure variable names
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- scumm.h 27 Apr 2003 09:39:52 -0000 1.169
+++ scumm.h 28 Apr 2003 03:13:47 -0000 1.170
@@ -216,7 +216,7 @@
};
struct SentenceTab {
- byte unk5;
+ byte verb;
byte unk2;
uint16 unk4;
uint16 unk3;
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- script_v5.cpp 27 Apr 2003 18:49:26 -0000 1.48
+++ script_v5.cpp 28 Apr 2003 03:13:47 -0000 1.49
@@ -711,7 +711,7 @@
st = &_sentence[_sentenceNum++];
- st->unk5 = a;
+ st->verb = a;
st->unk4 = getVarOrDirectWord(0x40);
b = st->unk3 = getVarOrDirectWord(0x20);
if (b == 0) {
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.29
retrieving revision 2.30
diff -u -d -r2.29 -r2.30
--- script_v2.cpp 27 Apr 2003 11:38:38 -0000 2.29
+++ script_v2.cpp 28 Apr 2003 03:13:47 -0000 2.30
@@ -816,7 +816,7 @@
st = &_sentence[_sentenceNum++];
- st->unk5 = a;
+ st->verb = a;
st->unk4 = getVarOrDirectWord(0x40);
st->unk3 = getVarOrDirectWord(0x20);
st->freezeCount = 0;
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- script.cpp 27 Apr 2003 09:39:52 -0000 1.66
+++ script.cpp 28 Apr 2003 03:13:48 -0000 1.67
@@ -794,7 +794,7 @@
// Check if this doSentence request is identical to the previous one;
// if yes, ignore this invocation.
- if (_sentenceNum && st->unk5 == c && st->unk4 == b && st->unk3 == a)
+ if (_sentenceNum && st->verb == c && st->unk4 == b && st->unk3 == a)
return;
_sentenceNum++;
@@ -811,7 +811,7 @@
}
- st->unk5 = c;
+ st->verb = c;
st->unk4 = b;
st->unk3 = a;
st->freezeCount = 0;
@@ -838,7 +838,7 @@
if (_sentence[_sentenceNum].unk2 && _sentence[_sentenceNum].unk3 == _sentence[_sentenceNum].unk4)
return;
- _localParamList[0] = _sentence[_sentenceNum].unk5;
+ _localParamList[0] = _sentence[_sentenceNum].verb;
_localParamList[1] = _sentence[_sentenceNum].unk4;
_localParamList[2] = _sentence[_sentenceNum].unk3;
_currentScript = 0xFF;
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- saveload.cpp 23 Apr 2003 09:20:22 -0000 1.58
+++ saveload.cpp 28 Apr 2003 03:13:49 -0000 1.59
@@ -506,7 +506,7 @@
};
const SaveLoadEntry sentenceTabEntries[] = {
- MKLINE(SentenceTab, unk5, sleUint8, VER_V8),
+ MKLINE(SentenceTab, verb, sleUint8, VER_V8),
MKLINE(SentenceTab, unk2, sleUint8, VER_V8),
MKLINE(SentenceTab, unk4, sleUint16, VER_V8),
MKLINE(SentenceTab, unk3, sleUint16, VER_V8),
More information about the Scummvm-git-logs
mailing list