[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.317,2.318 script_v100he.cpp,2.28,2.29 script_v72he.cpp,2.186,2.187 script_v7he.cpp,2.119,2.120 script_v80he.cpp,2.64,2.65 script_v90he.cpp,2.112,2.113
Gregory Montoir
cyx at users.sourceforge.net
Fri Nov 26 16:54:43 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga events.cpp,1.30,1.31 ihnm_introproc.cpp,1.27,1.28 sfuncs.cpp,1.42,1.43 sndres.cpp,1.29,1.30 sndres.h,1.14,1.15 sound.cpp,1.15,1.16 sound.h,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: scummvm/graphics font.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4251/scumm
Modified Files:
intern.h script_v100he.cpp script_v72he.cpp script_v7he.cpp
script_v80he.cpp script_v90he.cpp
Log Message:
renamed some HE opcodes and got rid of o72_unknownEF as it seems it was a duplicate of o70_unknownEF
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.317
retrieving revision 2.318
diff -u -d -r2.317 -r2.318
--- intern.h 23 Nov 2004 19:47:53 -0000 2.317
+++ intern.h 26 Nov 2004 20:17:02 -0000 2.318
@@ -632,7 +632,7 @@
virtual void redrawBGAreas();
- void arrrays_unk2(int dst, int src, int len2, int len);
+ void appendSubstring(int dst, int src, int len2, int len);
int findObject(int x, int y, int num, int *args);
void polygonErase(int fromId, int toId);
@@ -652,12 +652,12 @@
void o70_kernelSetFunctions();
void o70_getStringWidth();
void o70_getStringLen();
- void o70_unknownEF();
- void o70_stringCompare();
+ void o70_appendString();
+ void o70_compareString();
void o70_readINI();
void o70_writeINI();
- void o70_unknownF5();
- void o70_unknownF6();
+ void o70_getStringLenForWidth();
+ void o70_getCharIndexInString();
void o70_setFilePath();
void o70_setWindowCaption();
void o70_polygonOps();
@@ -740,7 +740,7 @@
void o72_pushDWord();
void o72_addMessageToStack();
void o72_isAnyOf();
- void o72_unknown50();
+ void o72_resetCutscene();
void o72_findObjectWithClassOf();
void o72_getObjectImageX();
void o72_getObjectImageY();
@@ -773,9 +773,8 @@
void o72_getPixel();
void o72_pickVarRandom();
void o72_redimArray();
- void o72_unknownEC();
- void o72_unknownEF();
- void o72_unknownF0();
+ void o72_copyString();
+ void o72_concatString();
void o72_checkGlobQueue();
void o72_readINI();
void o72_writeINI();
@@ -903,7 +902,7 @@
void o90_shr4();
void o90_findAllObjectsWithClassOf();
void o90_getPolygonOverlap();
- void o90_unknown36();
+ void o90_cond();
void o90_dim2dim2Array();
void o90_sortArray();
void o90_getObjectData();
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.28
retrieving revision 2.29
diff -u -d -r2.28 -r2.29
--- script_v100he.cpp 23 Nov 2004 19:47:54 -0000 2.28
+++ script_v100he.cpp 26 Nov 2004 20:17:02 -0000 2.29
@@ -324,15 +324,15 @@
OPCODE(o6_startScriptQuick2),
OPCODE(o6_getState),
/* E0 */
- OPCODE(o70_stringCompare),
- OPCODE(o72_unknownEC),
- OPCODE(o72_unknownEF),
- OPCODE(o72_unknownF0),
+ OPCODE(o70_compareString),
+ OPCODE(o72_copyString),
+ OPCODE(o70_appendString),
+ OPCODE(o72_concatString),
/* E4 */
OPCODE(o70_getStringLen),
- OPCODE(o70_unknownF5),
+ OPCODE(o70_getStringLenForWidth),
OPCODE(o6_invalid),
- OPCODE(o70_unknownF6),
+ OPCODE(o70_getCharIndexInString),
/* E8 */
OPCODE(o70_getStringWidth),
OPCODE(o60_readFilePos),
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.186
retrieving revision 2.187
diff -u -d -r2.186 -r2.187
--- script_v72he.cpp 23 Nov 2004 19:47:54 -0000 2.186
+++ script_v72he.cpp 26 Nov 2004 20:17:02 -0000 2.187
@@ -145,7 +145,7 @@
OPCODE(o6_invalid),
OPCODE(o6_wordVarInc),
/* 50 */
- OPCODE(o72_unknown50),
+ OPCODE(o72_resetCutscene),
OPCODE(o6_invalid),
OPCODE(o72_findObjectWithClassOf),
OPCODE(o6_wordArrayInc),
@@ -340,19 +340,19 @@
OPCODE(o72_redimArray),
OPCODE(o60_readFilePos),
/* EC */
- OPCODE(o72_unknownEC),
+ OPCODE(o72_copyString),
OPCODE(o70_getStringWidth),
OPCODE(o70_getStringLen),
- OPCODE(o72_unknownEF),
+ OPCODE(o70_appendString),
/* F0 */
- OPCODE(o72_unknownF0),
- OPCODE(o70_stringCompare),
+ OPCODE(o72_concatString),
+ OPCODE(o70_compareString),
OPCODE(o72_checkGlobQueue),
OPCODE(o72_readINI),
/* F4 */
OPCODE(o72_writeINI),
- OPCODE(o70_unknownF5),
- OPCODE(o70_unknownF6),
+ OPCODE(o70_getStringLenForWidth),
+ OPCODE(o70_getCharIndexInString),
OPCODE(o6_invalid),
/* F8 */
OPCODE(o72_getResourceSize),
@@ -638,7 +638,7 @@
push(0);
}
-void ScummEngine_v72he::o72_unknown50() {
+void ScummEngine_v72he::o72_resetCutscene() {
int idx;
idx = vm.cutSceneStackPointer;
@@ -2367,7 +2367,7 @@
ah->dim2end = TO_LE_32(newDim2end);
}
-void ScummEngine_v72he::o72_unknownEC() {
+void ScummEngine_v72he::o72_copyString() {
int dst, size;
int src = pop();
@@ -2378,34 +2378,13 @@
writeArray(0, 0, 0, 0);
dst = readVar(0);
- arrrays_unk2(dst, src, -1, -1);
-
- push(dst);
- debug(1,"stub o72_unknownEC");
-}
-
-void ScummEngine_v72he::o72_unknownEF() {
- int dst, size;
-
- int len = pop();
- int srcOffs = pop();
- int src = pop();
-
- size = len - srcOffs + 2;
-
- writeVar(0, 0);
- defineArray(0, kStringArray, 0, 0, 0, size);
- writeArray(0, 0, 0, 0);
-
- dst = readVar(0);
-
- arrrays_unk2(dst, src, srcOffs, len);
+ appendSubstring(dst, src, -1, -1);
push(dst);
- debug(1,"stub o72_unknownEF");
+ debug(1,"stub o72_copyString");
}
-void ScummEngine_v72he::o72_unknownF0() {
+void ScummEngine_v72he::o72_concatString() {
int dst, size;
int src2 = pop();
@@ -2420,11 +2399,11 @@
dst = readVar(0);
- arrrays_unk2(dst, src1, 0, -1);
- arrrays_unk2(dst, src2, 0, -1);
+ appendSubstring(dst, src1, 0, -1);
+ appendSubstring(dst, src2, 0, -1);
push(dst);
- debug(1,"stub o72_unknownF0");
+ debug(1,"stub o72_concatString");
}
void ScummEngine_v72he::o72_checkGlobQueue() {
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.119
retrieving revision 2.120
diff -u -d -r2.119 -r2.120
--- script_v7he.cpp 23 Nov 2004 19:47:54 -0000 2.119
+++ script_v7he.cpp 26 Nov 2004 20:17:02 -0000 2.120
@@ -344,16 +344,16 @@
OPCODE(o6_invalid),
OPCODE(o70_getStringWidth),
OPCODE(o70_getStringLen),
- OPCODE(o70_unknownEF),
+ OPCODE(o70_appendString),
/* F0 */
OPCODE(o6_invalid),
- OPCODE(o70_stringCompare),
+ OPCODE(o70_compareString),
OPCODE(o6_invalid),
OPCODE(o70_readINI),
/* F4 */
OPCODE(o70_writeINI),
- OPCODE(o70_unknownF5),
- OPCODE(o70_unknownF6),
+ OPCODE(o70_getStringLenForWidth),
+ OPCODE(o70_getCharIndexInString),
OPCODE(o6_invalid),
/* F8 */
OPCODE(o6_invalid),
@@ -379,7 +379,7 @@
return _opcodesv70he[i].desc;
}
-void ScummEngine_v70he::arrrays_unk2(int dst, int src, int srcOffs, int len) {
+void ScummEngine_v70he::appendSubstring(int dst, int src, int srcOffs, int len) {
int dstOffs, value;
int i = 0;
@@ -813,7 +813,7 @@
push(len);
}
-void ScummEngine_v70he::o70_unknownEF() {
+void ScummEngine_v70he::o70_appendString() {
int dst, size;
int len = pop();
@@ -828,13 +828,13 @@
dst = readVar(0);
- arrrays_unk2(dst, src, srcOffs, len);
+ appendSubstring(dst, src, srcOffs, len);
push(dst);
- debug(1,"stub o70_unknownEF");
+ debug(1,"stub o70_appendString");
}
-void ScummEngine_v70he::o70_stringCompare() {
+void ScummEngine_v70he::o70_compareString() {
byte *addr, *addr2;
int i = 0;
@@ -843,11 +843,11 @@
addr = getStringAddress(id);
if (!addr)
- error("o70_stringCompare: Reference to zeroed array pointer (%d)", id);
+ error("o70_compareString: Reference to zeroed array pointer (%d)", id);
addr2 = getStringAddress(id2);
if (!addr2)
- error("o70_stringCompare: Reference to zeroed array pointer (%d)", id);
+ error("o70_compareString: Reference to zeroed array pointer (%d)", id);
while(1) {
if (*addr != *addr2)
@@ -873,7 +873,7 @@
}
push (i);
- debug(1,"o70_stringCompare stub (%d, %d, %d)", id, id2, i);
+ debug(1,"o70_compareString stub (%d, %d, %d)", id, id2, i);
}
void ScummEngine_v70he::o70_readINI() {
@@ -934,7 +934,7 @@
}
}
-void ScummEngine_v70he::o70_unknownF5() {
+void ScummEngine_v70he::o70_getStringLenForWidth() {
int chr, max;
int array, len, pos, width = 0;
@@ -956,10 +956,10 @@
}
push(len);
- debug(1,"stub o70_unknownF5 (%d)", len);
+ debug(1,"stub o70_getStringLenForWidth (%d)", len);
}
-void ScummEngine_v70he::o70_unknownF6() {
+void ScummEngine_v70he::o70_getCharIndexInString() {
int array, end, len, pos, value;
value = pop();
@@ -998,7 +998,7 @@
}
push(-1);
- debug(1,"stub o70_unknownF6");
+ debug(1,"stub o70_getCharIndexInString");
}
void ScummEngine_v70he::o70_setFilePath() {
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.64
retrieving revision 2.65
diff -u -d -r2.64 -r2.65
--- script_v80he.cpp 23 Nov 2004 19:47:54 -0000 2.64
+++ script_v80he.cpp 26 Nov 2004 20:17:02 -0000 2.65
@@ -144,7 +144,7 @@
OPCODE(o80_writeConfigFile),
OPCODE(o6_wordVarInc),
/* 50 */
- OPCODE(o72_unknown50),
+ OPCODE(o72_resetCutscene),
OPCODE(o6_invalid),
OPCODE(o72_findObjectWithClassOf),
OPCODE(o6_wordArrayInc),
@@ -339,19 +339,19 @@
OPCODE(o72_redimArray),
OPCODE(o60_readFilePos),
/* EC */
- OPCODE(o72_unknownEC),
+ OPCODE(o72_copyString),
OPCODE(o70_getStringWidth),
OPCODE(o70_getStringLen),
- OPCODE(o72_unknownEF),
+ OPCODE(o70_appendString),
/* F0 */
- OPCODE(o72_unknownF0),
- OPCODE(o70_stringCompare),
+ OPCODE(o72_concatString),
+ OPCODE(o70_compareString),
OPCODE(o72_checkGlobQueue),
OPCODE(o72_readINI),
/* F4 */
OPCODE(o72_writeINI),
- OPCODE(o70_unknownF5),
- OPCODE(o70_unknownF6),
+ OPCODE(o70_getStringLenForWidth),
+ OPCODE(o70_getCharIndexInString),
OPCODE(o6_invalid),
/* F8 */
OPCODE(o72_getResourceSize),
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.112
retrieving revision 2.113
diff -u -d -r2.112 -r2.113
--- script_v90he.cpp 23 Nov 2004 19:47:54 -0000 2.112
+++ script_v90he.cpp 26 Nov 2004 20:17:02 -0000 2.113
@@ -90,11 +90,11 @@
OPCODE(o90_getSegmentAngle),
/* 24 */
OPCODE(o90_getDistanceBetweenPoints),
- OPCODE(o90_unknown25),
- OPCODE(o90_unknown26),
- OPCODE(o90_unknown27),
+ OPCODE(o90_unknown25), // o90_getSpriteInfo
+ OPCODE(o90_unknown26), // o90_setSpriteInfo
+ OPCODE(o90_unknown27), // o90_getSpriteGroupInfo
/* 28 */
- OPCODE(o90_unknown28),
+ OPCODE(o90_unknown28), // o90_setSpriteGroupInfo
OPCODE(o90_getWizData),
OPCODE(o6_invalid),
OPCODE(o90_startScriptUnk),
@@ -111,7 +111,7 @@
/* 34 */
OPCODE(o90_findAllObjectsWithClassOf),
OPCODE(o90_getPolygonOverlap),
- OPCODE(o90_unknown36),
+ OPCODE(o90_cond),
OPCODE(o90_dim2dim2Array),
/* 38 */
OPCODE(o6_invalid),
@@ -144,7 +144,7 @@
OPCODE(o80_writeConfigFile),
OPCODE(o6_wordVarInc),
/* 50 */
- OPCODE(o72_unknown50),
+ OPCODE(o72_resetCutscene),
OPCODE(o6_invalid),
OPCODE(o72_findObjectWithClassOf),
OPCODE(o6_wordArrayInc),
@@ -339,19 +339,19 @@
OPCODE(o72_redimArray),
OPCODE(o60_readFilePos),
/* EC */
- OPCODE(o72_unknownEC),
+ OPCODE(o72_copyString),
OPCODE(o70_getStringWidth),
OPCODE(o70_getStringLen),
- OPCODE(o72_unknownEF),
+ OPCODE(o70_appendString),
/* F0 */
- OPCODE(o72_unknownF0),
- OPCODE(o70_stringCompare),
+ OPCODE(o72_concatString),
+ OPCODE(o70_compareString),
OPCODE(o72_checkGlobQueue),
OPCODE(o72_readINI),
/* F4 */
OPCODE(o72_writeINI),
- OPCODE(o70_unknownF5),
- OPCODE(o70_unknownF6),
+ OPCODE(o70_getStringLenForWidth),
+ OPCODE(o70_getCharIndexInString),
OPCODE(o6_invalid),
/* F8 */
OPCODE(o72_getResourceSize),
@@ -1510,7 +1510,7 @@
}
}
-void ScummEngine_v90he::o90_unknown36() {
+void ScummEngine_v90he::o90_cond() {
int a = pop();
int b = pop();
int c = pop();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga events.cpp,1.30,1.31 ihnm_introproc.cpp,1.27,1.28 sfuncs.cpp,1.42,1.43 sndres.cpp,1.29,1.30 sndres.h,1.14,1.15 sound.cpp,1.15,1.16 sound.h,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: scummvm/graphics font.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list