[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.497,2.498 script_v72he.cpp,2.292,2.293 script_v80he.cpp,2.114,2.115 script_v90he.cpp,2.255,2.256 scumm.cpp,1.528,1.529
kirben
kirben at users.sourceforge.net
Sat May 21 07:25:21 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.454,2.455
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.44,2.45 scumm.cpp,1.529,1.530 sound.cpp,1.464,1.465 vars.cpp,1.138,1.139
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25774/scumm
Modified Files:
intern.h script_v72he.cpp script_v80he.cpp script_v90he.cpp
scumm.cpp
Log Message:
Add HE73 version for opcode difference.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.497
retrieving revision 2.498
diff -u -d -r2.497 -r2.498
--- intern.h 20 May 2005 06:47:57 -0000 2.497
+++ intern.h 21 May 2005 14:20:28 -0000 2.498
@@ -1072,7 +1072,6 @@
void o80_drawWizPolygon();
void o80_drawLine();
void o80_pickVarRandom();
- void o80_getResourceSize();
};
struct SpriteInfo;
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.292
retrieving revision 2.293
diff -u -d -r2.292 -r2.293
--- script_v72he.cpp 14 May 2005 01:30:00 -0000 2.292
+++ script_v72he.cpp 21 May 2005 14:20:28 -0000 2.293
@@ -2215,8 +2215,41 @@
}
void ScummEngine_v72he::o72_getResourceSize() {
+ const byte *ptr;
+ int size, type;
+
int resid = pop();
- push(getSoundResourceSize(resid));
+ if (_heversion == 72) {
+ push(getSoundResourceSize(resid));
+ return;
+ }
+
+ byte subOp = fetchScriptByte();
+
+ switch (subOp) {
+ case 13:
+ push (getSoundResourceSize(resid));
+ return;
+ case 14:
+ type = rtRoomImage;
+ break;
+ case 15:
+ type = rtImage;
+ break;
+ case 16:
+ type = rtCostume;
+ break;
+ case 17:
+ type = rtScript;
+ break;
+ default:
+ error("o80_getResourceSize: default type %d", subOp);
+ }
+
+ ptr = getResourceAddress(type, resid);
+ assert(ptr);
+ size = READ_BE_UINT32(ptr + 4) - 8;
+ push(size);
}
void ScummEngine_v72he::o72_setFilePath() {
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.114
retrieving revision 2.115
diff -u -d -r2.114 -r2.115
--- script_v80he.cpp 10 May 2005 22:56:11 -0000 2.114
+++ script_v80he.cpp 21 May 2005 14:20:28 -0000 2.115
@@ -354,7 +354,7 @@
OPCODE(o70_getCharIndexInString),
OPCODE(o6_invalid),
/* F8 */
- OPCODE(o80_getResourceSize),
+ OPCODE(o72_getResourceSize),
OPCODE(o72_setFilePath),
OPCODE(o72_setWindowCaption),
OPCODE(o70_polygonOps),
@@ -824,37 +824,4 @@
push(readArray(value, 0, num));
}
-void ScummEngine_v80he::o80_getResourceSize() {
- const byte *ptr;
- int size, type;
-
- int resid = pop();
- byte subOp = fetchScriptByte();
-
- switch (subOp) {
- case 13:
- push (getSoundResourceSize(resid));
- return;
- case 14:
- type = rtRoomImage;
- break;
- case 15:
- type = rtImage;
- break;
- case 16:
- type = rtCostume;
- break;
- case 17:
- type = rtScript;
- break;
- default:
- error("o80_getResourceSize: default type %d", subOp);
- }
-
- ptr = getResourceAddress(type, resid);
- assert(ptr);
- size = READ_BE_UINT32(ptr + 4) - 8;
- push(size);
-}
-
} // End of namespace Scumm
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.255
retrieving revision 2.256
diff -u -d -r2.255 -r2.256
--- script_v90he.cpp 11 May 2005 09:38:01 -0000 2.255
+++ script_v90he.cpp 21 May 2005 14:20:28 -0000 2.256
@@ -353,7 +353,7 @@
OPCODE(o70_getCharIndexInString),
OPCODE(o6_invalid),
/* F8 */
- OPCODE(o80_getResourceSize),
+ OPCODE(o72_getResourceSize),
OPCODE(o72_setFilePath),
OPCODE(o72_setWindowCaption),
OPCODE(o70_polygonOps),
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -d -r1.528 -r1.529
--- scumm.cpp 21 May 2005 11:57:14 -0000 1.528
+++ scumm.cpp 21 May 2005 14:20:28 -0000 1.529
@@ -253,17 +253,17 @@
// Humongous Entertainment Scumm Version 7.2
{"catalog2", "Humongous Interactive Catalog 2", GID_HEGAME, 6, 72, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
- {"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_HEGAME, 6, 72, MDT_NONE,
+ {"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_HEGAME, 6, 73, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows, 0, 0},
{"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_HEGAME, 6, 72, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows, 0, 0},
- {"farm", "Let's Explore the Farm with Buzzy", GID_HEGAME, 6, 72, MDT_NONE,
+ {"farm", "Let's Explore the Farm with Buzzy", GID_HEGAME, 6, 73, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
{"airdemo", "Let's Explore the Airport with Buzzy (Demo)", GID_HEGAME, 6, 72, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows, 0, 0},
{"airport", "Let's Explore the Airport with Buzzy", GID_HEGAME, 6, 72, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
- {"jungle", "Let's Explore the Jungle with Buzzy", GID_HEGAME, 6, 72, MDT_NONE,
+ {"jungle", "Let's Explore the Jungle with Buzzy", GID_HEGAME, 6, 73, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
{"puttzoo", "Putt-Putt Saves the Zoo", GID_HEGAME, 6, 72, MDT_NONE,
@@ -2966,6 +2966,7 @@
case 80:
engine = new ScummEngine_v80he(detector, syst, game, md5sum, substLastIndex);
break;
+ case 73:
case 72:
engine = new ScummEngine_v72he(detector, syst, game, md5sum, substLastIndex);
break;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.454,2.455
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.44,2.45 scumm.cpp,1.529,1.530 sound.cpp,1.464,1.465 vars.cpp,1.138,1.139
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list