[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.148,2.149 script_v6he.cpp,2.30,2.31 script_v7he.cpp,2.3,2.4 scumm.h,1.374,1.375 scummvm.cpp,2.600,2.601
Eugene Sandulenko
sev at users.sourceforge.net
Mon Mar 1 16:41:02 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18717
Modified Files:
intern.h script_v6he.cpp script_v7he.cpp scumm.h scummvm.cpp
Log Message:
Implemented some HE specific opcodes
Added some HE GIDs
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.148
retrieving revision 2.149
diff -u -d -r2.148 -r2.149
--- intern.h 1 Mar 2004 07:06:36 -0000 2.148
+++ intern.h 2 Mar 2004 00:21:02 -0000 2.149
@@ -587,7 +587,7 @@
void o6_setVolume();
void o6_seekFilePos();
void o6_localizeArray();
- void o6_unknownEE();
+ void o6_stringLen();
void o6_unknownFA();
void o6_redimArray();
void o6_readINI();
@@ -620,6 +620,7 @@
/* Version 7 script opcodes */
void o7_objectX();
void o7_objectY();
+ void o7_unknownF4();
void o7_unknownFB();
};
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.30
retrieving revision 2.31
diff -u -d -r2.30 -r2.31
--- script_v6he.cpp 1 Mar 2004 06:23:25 -0000 2.30
+++ script_v6he.cpp 2 Mar 2004 00:21:02 -0000 2.31
@@ -344,7 +344,7 @@
/* EC */
OPCODE(o6_invalid),
OPCODE(o6_invalid),
- OPCODE(o6_unknownEE),
+ OPCODE(o6_stringLen),
OPCODE(o6_invalid),
/* F0 */
OPCODE(o6_invalid),
@@ -1244,10 +1244,22 @@
ah->dim2 = TO_LE_16(newX + 1);
}
-void ScummEngine_v6he::o6_unknownEE() {
- int a;
+// TODO: It's Win32 specific
+void ScummEngine_v6he::o6_stringLen() {
+ int a, len;
+
+ if (_gameId == GID_PUTTPUTT) {
+ o6_invalid();
+ }
+
a = pop();
- loadPtrToResource(rtVerb, _curVerbSlot, getStringAddress(a));
+
+ if (_gameId == GID_FREDDEMO) {
+ len = strlen((char *)getStringAddress(a));
+ } else {
+
+ }
+ push()
}
void ScummEngine_v6he::o6_readINI() {
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- script_v7he.cpp 1 Mar 2004 07:06:36 -0000 2.3
+++ script_v7he.cpp 2 Mar 2004 00:21:02 -0000 2.4
@@ -344,7 +344,7 @@
/* EC */
OPCODE(o6_invalid),
OPCODE(o6_invalid),
- OPCODE(o6_unknownEE),
+ OPCODE(o6_stringLen),
OPCODE(o6_invalid),
/* F0 */
OPCODE(o6_invalid),
@@ -352,7 +352,7 @@
OPCODE(o6_invalid),
OPCODE(o6_readINI),
/* F4 */
- OPCODE(o6_invalid),
+ OPCODE(o7_unknownF4),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
@@ -406,6 +406,27 @@
push(_objs[objnum].y_pos);
}
+void ScummEngine_v7he::o7_unknownF4() {
+ byte b;
+ int len;
+ b = fetchScriptByte();
+
+ switch (b) {
+ case 6:
+ pop();
+ len = resStrLen(_scriptPointer);
+ _scriptPointer += len + 1;
+ break;
+ case 7:
+ len = resStrLen(_scriptPointer);
+ _scriptPointer += len + 1;
+ len = resStrLen(_scriptPointer);
+ _scriptPointer += len + 1;
+ break;
+ }
+ warning("o7_unknownF4 stub");
+}
+
void ScummEngine_v7he::o7_unknownFB() {
byte b;
b = fetchScriptByte();
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -d -r1.374 -r1.375
--- scumm.h 24 Feb 2004 00:43:01 -0000 1.374
+++ scumm.h 2 Mar 2004 00:21:02 -0000 1.375
@@ -228,7 +228,9 @@
GID_FBEAR,
GID_PJSDEMO,
GID_MONKEY_SEGA,
- GID_FBPACK
+ GID_FBPACK,
+ GID_FREDDI,
+ GID_FREDDEMO
};
#define _baseRooms res.address[rtRoom]
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.600
retrieving revision 2.601
diff -u -d -r2.600 -r2.601
--- scummvm.cpp 1 Mar 2004 08:08:42 -0000 2.600
+++ scummvm.cpp 2 Mar 2004 00:21:02 -0000 2.601
@@ -211,9 +211,9 @@
* several interpreter versions... */
{"zoodemo", "Putt-Putt Saves the Zoo (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
- {"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_PUTTPUTT, 6, MDT_NONE,
+ {"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_FREDDI, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
- {"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+ {"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_FREDDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
{"pjs-demo", "Pajama Sam 1: No Need to Hide When It's Dark Outside (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
More information about the Scummvm-git-logs
mailing list