[Scummvm-cvs-logs] SF.net SVN: scummvm: [25850] scummvm/trunk/engines/scumm
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sun Feb 25 12:38:21 CET 2007
Revision: 25850
http://scummvm.svn.sourceforge.net/scummvm/?rev=25850&view=rev
Author: kirben
Date: 2007-02-25 03:38:19 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
Rename C64 engine class, since it is been used by Apple II and Commodore 64 versions now.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/intern.h
scummvm/trunk/engines/scumm/object.cpp
scummvm/trunk/engines/scumm/plugin.cpp
scummvm/trunk/engines/scumm/saveload.cpp
scummvm/trunk/engines/scumm/script_c64.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/scumm/vars.cpp
scummvm/trunk/engines/scumm/verbs.cpp
Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h 2007-02-25 08:37:15 UTC (rev 25849)
+++ scummvm/trunk/engines/scumm/intern.h 2007-02-25 11:38:19 UTC (rev 25850)
@@ -418,11 +418,11 @@
};
/**
- * Engine for Commodore 64 version of Maniac Mansion
+ * Engine for Apple II and Commodore 64 versions of Maniac Mansion
*/
-class ScummEngine_c64 : public ScummEngine_v2 {
+class ScummEngine_v0 : public ScummEngine_v2 {
protected:
- typedef void (ScummEngine_c64::*OpcodeProcC64)();
+ typedef void (ScummEngine_v0::*OpcodeProcC64)();
struct OpcodeEntryC64 {
OpcodeProcC64 proc;
const char *desc;
@@ -432,7 +432,7 @@
int _currentMode;
public:
- ScummEngine_c64(OSystem *syst, const DetectorResult &dr);
+ ScummEngine_v0(OSystem *syst, const DetectorResult &dr);
virtual void resetScumm();
Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp 2007-02-25 08:37:15 UTC (rev 25849)
+++ scummvm/trunk/engines/scumm/object.cpp 2007-02-25 11:38:19 UTC (rev 25850)
@@ -865,7 +865,7 @@
}
}
-void ScummEngine_c64::resetRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
+void ScummEngine_v0::resetRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
assert(room);
const byte *ptr = room + od->OBCDoffset;
ptr -= 2;
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp 2007-02-25 08:37:15 UTC (rev 25849)
+++ scummvm/trunk/engines/scumm/plugin.cpp 2007-02-25 11:38:19 UTC (rev 25850)
@@ -1651,7 +1651,7 @@
// instantiate the appropriate game engine. Hooray!
switch (res.game.version) {
case 0:
- *engine = new ScummEngine_c64(syst, res);
+ *engine = new ScummEngine_v0(syst, res);
break;
case 1:
case 2:
Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp 2007-02-25 08:37:15 UTC (rev 25849)
+++ scummvm/trunk/engines/scumm/saveload.cpp 2007-02-25 11:38:19 UTC (rev 25850)
@@ -1153,7 +1153,7 @@
}
}
-void ScummEngine_c64::saveOrLoad(Serializer *s) {
+void ScummEngine_v0::saveOrLoad(Serializer *s) {
ScummEngine::saveOrLoad(s);
// TODO: Save additional variables
Modified: scummvm/trunk/engines/scumm/script_c64.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_c64.cpp 2007-02-25 08:37:15 UTC (rev 25849)
+++ scummvm/trunk/engines/scumm/script_c64.cpp 2007-02-25 11:38:19 UTC (rev 25850)
@@ -31,9 +31,9 @@
namespace Scumm {
-#define OPCODE(x) _OPCODE(ScummEngine_c64, x)
+#define OPCODE(x) _OPCODE(ScummEngine_v0, x)
-void ScummEngine_c64::setupOpcodes() {
+void ScummEngine_v0::setupOpcodes() {
static const OpcodeEntryC64 opcodes[256] = {
/* 00 */
OPCODE(o5_stopObjectCode),
@@ -366,31 +366,31 @@
#define PARAM_2 0x40
#define PARAM_3 0x20
-void ScummEngine_c64::executeOpcode(byte i) {
+void ScummEngine_v0::executeOpcode(byte i) {
OpcodeProcC64 op = _opcodesC64[i].proc;
(this->*op) ();
}
-int ScummEngine_c64::getVarOrDirectWord(byte mask) {
+int ScummEngine_v0::getVarOrDirectWord(byte mask) {
return getVarOrDirectByte(mask);
}
-uint ScummEngine_c64::fetchScriptWord() {
+uint ScummEngine_v0::fetchScriptWord() {
return fetchScriptByte();
}
-const char *ScummEngine_c64::getOpcodeDesc(byte i) {
+const char *ScummEngine_v0::getOpcodeDesc(byte i) {
return _opcodesC64[i].desc;
}
-int ScummEngine_c64::getObjectFlag() {
+int ScummEngine_v0::getObjectFlag() {
if (_opcode & 0x40)
return _activeObject;
return fetchScriptByte();
}
-void ScummEngine_c64::decodeParseString() {
+void ScummEngine_v0::decodeParseString() {
byte buffer[512];
byte *ptr = buffer;
byte c;
@@ -426,17 +426,17 @@
actorTalk(buffer);
}
-void ScummEngine_c64::setStateCommon(byte type) {
+void ScummEngine_v0::setStateCommon(byte type) {
int obj = getObjectFlag();
putState(obj, getState(obj) | type);
}
-void ScummEngine_c64::clearStateCommon(byte type) {
+void ScummEngine_v0::clearStateCommon(byte type) {
int obj = getObjectFlag();
putState(obj, getState(obj) & ~type);
}
-void ScummEngine_c64::ifStateCommon(byte type) {
+void ScummEngine_v0::ifStateCommon(byte type) {
int obj = getObjectFlag();
if ((getState(obj) & type) != 0)
@@ -445,7 +445,7 @@
o_jumpRelative();
}
-void ScummEngine_c64::ifNotStateCommon(byte type) {
+void ScummEngine_v0::ifNotStateCommon(byte type) {
int obj = getObjectFlag();
if ((getState(obj) & type) == 0)
@@ -454,7 +454,7 @@
o_jumpRelative();
}
-void ScummEngine_c64::drawSentence() {
+void ScummEngine_v0::drawSentence() {
Common::Rect sentenceline;
const byte *temp;
int sentencePrep = 0;
@@ -557,21 +557,21 @@
drawString(2, (byte*)string);
}
-void ScummEngine_c64::o_setState08() {
+void ScummEngine_v0::o_setState08() {
int obj = getObjectFlag();
putState(obj, getState(obj) | kObjectState_08);
markObjectRectAsDirty(obj);
clearDrawObjectQueue();
}
-void ScummEngine_c64::o_clearState08() {
+void ScummEngine_v0::o_clearState08() {
int obj = getObjectFlag();
putState(obj, getState(obj) & ~kObjectState_08);
markObjectRectAsDirty(obj);
clearDrawObjectQueue();
}
-void ScummEngine_c64::o_stopCurrentScript() {
+void ScummEngine_v0::o_stopCurrentScript() {
int script;
script = vm.slot[_currentScript].number;
@@ -582,57 +582,57 @@
stopScript(script);
}
-void ScummEngine_c64::o_loadSound() {
+void ScummEngine_v0::o_loadSound() {
int resid = fetchScriptByte();
ensureResourceLoaded(rtSound, resid);
}
-void ScummEngine_c64::o_lockSound() {
+void ScummEngine_v0::o_lockSound() {
int resid = fetchScriptByte();
_res->lock(rtSound, resid);
}
-void ScummEngine_c64::o_unlockSound() {
+void ScummEngine_v0::o_unlockSound() {
int resid = fetchScriptByte();
_res->unlock(rtSound, resid);
}
-void ScummEngine_c64::o_loadCostume() {
+void ScummEngine_v0::o_loadCostume() {
int resid = getVarOrDirectByte(PARAM_1);
ensureResourceLoaded(rtCostume, resid);
}
-void ScummEngine_c64::o_lockCostume() {
+void ScummEngine_v0::o_lockCostume() {
int resid = fetchScriptByte();
_res->lock(rtCostume, resid);
}
-void ScummEngine_c64::o_unlockCostume() {
+void ScummEngine_v0::o_unlockCostume() {
int resid = fetchScriptByte();
_res->unlock(rtCostume, resid);
}
-void ScummEngine_c64::o_loadScript() {
+void ScummEngine_v0::o_loadScript() {
int resid = getVarOrDirectByte(PARAM_1);
ensureResourceLoaded(rtScript, resid);
}
-void ScummEngine_c64::o_lockScript() {
+void ScummEngine_v0::o_lockScript() {
int resid = fetchScriptByte();
_res->lock(rtScript, resid);
}
-void ScummEngine_c64::o_unlockScript() {
+void ScummEngine_v0::o_unlockScript() {
int resid = fetchScriptByte();
_res->unlock(rtScript, resid);
}
-void ScummEngine_c64::o_loadRoom() {
+void ScummEngine_v0::o_loadRoom() {
int resid = getVarOrDirectByte(PARAM_1);
ensureResourceLoaded(rtRoom, resid);
}
-void ScummEngine_c64::o_loadRoomWithEgo() {
+void ScummEngine_v0::o_loadRoomWithEgo() {
Actor *a;
int obj, room, x, y, dir;
@@ -663,17 +663,17 @@
}
}
-void ScummEngine_c64::o_lockRoom() {
+void ScummEngine_v0::o_lockRoom() {
int resid = fetchScriptByte();
_res->lock(rtRoom, resid);
}
-void ScummEngine_c64::o_unlockRoom() {
+void ScummEngine_v0::o_unlockRoom() {
int resid = fetchScriptByte();
_res->unlock(rtRoom, resid);
}
-void ScummEngine_c64::o_cursorCommand() {
+void ScummEngine_v0::o_cursorCommand() {
// TODO
int state = 0;
@@ -696,7 +696,7 @@
debug(0, "o_cursorCommand(%d)", _currentMode);
}
-void ScummEngine_c64::o_lights() {
+void ScummEngine_v0::o_lights() {
int a;
a = getVarOrDirectByte(PARAM_1);
@@ -715,7 +715,7 @@
_fullRedraw = true;
}
-void ScummEngine_c64::o_animateActor() {
+void ScummEngine_v0::o_animateActor() {
int act = getVarOrDirectByte(PARAM_1);
int anim = getVarOrDirectByte(PARAM_2);
int unk = fetchScriptByte();
@@ -725,7 +725,7 @@
a->animateActor(anim);
}
-void ScummEngine_c64::o_getActorMoving() {
+void ScummEngine_v0::o_getActorMoving() {
getResultPos();
int act = getVarOrDirectByte(PARAM_1);
Actor *a = derefActor(act, "o_getActorMoving");
@@ -735,7 +735,7 @@
setResult(2);
}
-void ScummEngine_c64::o_putActorAtObject() {
+void ScummEngine_v0::o_putActorAtObject() {
int obj, x, y;
Actor *a;
@@ -752,7 +752,7 @@
a->putActor(x, y);
}
-void ScummEngine_c64::o_pickupObject() {
+void ScummEngine_v0::o_pickupObject() {
int obj = fetchScriptByte();
if (obj == 0) {
obj = _activeObject;
@@ -777,16 +777,16 @@
runInventoryScript(1);
}
-void ScummEngine_c64::o_setObjectName() {
+void ScummEngine_v0::o_setObjectName() {
int obj = fetchScriptByte();
setObjectName(obj);
}
-void ScummEngine_c64::o_nop() {
+void ScummEngine_v0::o_nop() {
}
// TODO: Maybe translate actor flags in future.
-void ScummEngine_c64::o_setActorBitVar() {
+void ScummEngine_v0::o_setActorBitVar() {
byte act = getVarOrDirectByte(PARAM_1);
byte mask = getVarOrDirectByte(PARAM_2);
byte mod = getVarOrDirectByte(PARAM_3);
@@ -800,7 +800,7 @@
debug(0, "o_setActorBitVar(%d, %d, %d)", act, mask, mod);
}
-void ScummEngine_c64::o_getActorBitVar() {
+void ScummEngine_v0::o_getActorBitVar() {
getResultPos();
byte act = getVarOrDirectByte(PARAM_1);
byte mask = getVarOrDirectByte(PARAM_2);
@@ -811,7 +811,7 @@
debug(0, "o_getActorBitVar(%d, %d, %d)", act, mask, (a->_miscflags & mask));
}
-void ScummEngine_c64::o_setBitVar() {
+void ScummEngine_v0::o_setBitVar() {
byte flag = getVarOrDirectByte(PARAM_1);
byte mask = getVarOrDirectByte(PARAM_2);
byte mod = getVarOrDirectByte(PARAM_3);
@@ -824,7 +824,7 @@
debug(0, "o_setBitVar (%d, %d %d)", flag, mask, mod);
}
-void ScummEngine_c64::o_getBitVar() {
+void ScummEngine_v0::o_getBitVar() {
getResultPos();
byte flag = getVarOrDirectByte(PARAM_1);
byte mask = getVarOrDirectByte(PARAM_2);
@@ -834,17 +834,17 @@
debug(0, "o_getBitVar (%d, %d %d)", flag, mask, _bitVars[flag] & (1 << mask));
}
-void ScummEngine_c64::o_print_c64() {
+void ScummEngine_v0::o_print_c64() {
_actorToPrintStrFor = fetchScriptByte();
decodeParseString();
}
-void ScummEngine_c64::o_printEgo_c64() {
+void ScummEngine_v0::o_printEgo_c64() {
_actorToPrintStrFor = (byte)VAR(VAR_EGO);
decodeParseString();
}
-void ScummEngine_c64::o_doSentence() {
+void ScummEngine_v0::o_doSentence() {
byte entry = fetchScriptByte();
byte obj = fetchScriptByte();
fetchScriptByte();
@@ -852,12 +852,12 @@
runObjectScript(obj, entry, false, false, NULL);
}
-void ScummEngine_c64::o_unknown2() {
+void ScummEngine_v0::o_unknown2() {
byte var1 = fetchScriptByte();
error("STUB: o_unknown2(%d)", var1);
}
-void ScummEngine_c64::o_ifActiveObject() {
+void ScummEngine_v0::o_ifActiveObject() {
byte obj = fetchScriptByte();
if (obj == _activeInventory)
@@ -866,7 +866,7 @@
o_jumpRelative();
}
-void ScummEngine_c64::o_getClosestObjActor() {
+void ScummEngine_v0::o_getClosestObjActor() {
int obj;
int act;
int dist;
@@ -893,7 +893,7 @@
setResult(closest_obj);
}
-void ScummEngine_c64::o_cutscene() {
+void ScummEngine_v0::o_cutscene() {
vm.cutSceneData[0] = _userState | (_userPut ? 16 : 0);
vm.cutSceneData[2] = _currentRoom;
vm.cutSceneData[3] = camera._mode;
@@ -908,7 +908,7 @@
vm.cutScenePtr[0] = 0;
}
-void ScummEngine_c64::o_endCutscene() {
+void ScummEngine_v0::o_endCutscene() {
vm.cutSceneStackPointer = 0;
VAR(VAR_OVERRIDE) = 0;
@@ -926,7 +926,7 @@
}
}
-void ScummEngine_c64::o_beginOverride() {
+void ScummEngine_v0::o_beginOverride() {
const int idx = vm.cutSceneStackPointer;
assert(0 <= idx && idx < 5);
@@ -943,7 +943,7 @@
VAR(VAR_OVERRIDE) = 0;
}
-void ScummEngine_c64::o_isEqual() {
+void ScummEngine_v0::o_isEqual() {
int16 a, b;
int var;
@@ -958,7 +958,7 @@
}
-void ScummEngine_c64::o_isGreater() {
+void ScummEngine_v0::o_isGreater() {
int16 a = getVar();
int16 b = getVarOrDirectByte(PARAM_1);
if (b > a)
@@ -967,7 +967,7 @@
o_jumpRelative();
}
-void ScummEngine_c64::o_isGreaterEqual() {
+void ScummEngine_v0::o_isGreaterEqual() {
int16 a = getVar();
int16 b = getVarOrDirectByte(PARAM_1);
if (b >= a)
@@ -976,7 +976,7 @@
o_jumpRelative();
}
-void ScummEngine_c64::o_isLess() {
+void ScummEngine_v0::o_isLess() {
int16 a = getVar();
int16 b = getVarOrDirectByte(PARAM_1);
if (b < a)
@@ -985,7 +985,7 @@
o_jumpRelative();
}
-void ScummEngine_c64::o_isLessEqual() {
+void ScummEngine_v0::o_isLessEqual() {
int16 a = getVar();
int16 b = getVarOrDirectByte(PARAM_1);
@@ -995,7 +995,7 @@
o_jumpRelative();
}
-void ScummEngine_c64::o_isNotEqual() {
+void ScummEngine_v0::o_isNotEqual() {
int16 a = getVar();
int16 b = getVarOrDirectByte(PARAM_1);
if (b != a)
@@ -1004,7 +1004,7 @@
o_jumpRelative();
}
-void ScummEngine_c64::o_notEqualZero() {
+void ScummEngine_v0::o_notEqualZero() {
int a = getVar();
if (a != 0)
ScummEngine::fetchScriptWord();
@@ -1012,7 +1012,7 @@
o_jumpRelative();
}
-void ScummEngine_c64::o_equalZero() {
+void ScummEngine_v0::o_equalZero() {
int a = getVar();
if (a == 0)
ScummEngine::fetchScriptWord();
@@ -1020,12 +1020,12 @@
o_jumpRelative();
}
-void ScummEngine_c64::o_jumpRelative() {
+void ScummEngine_v0::o_jumpRelative() {
int16 offset = (int16)ScummEngine::fetchScriptWord();
_scriptPointer += offset;
}
-void ScummEngine_c64::o_setOwnerOf() {
+void ScummEngine_v0::o_setOwnerOf() {
int obj, owner;
obj = getVarOrDirectWord(PARAM_1);
@@ -1037,7 +1037,7 @@
setOwnerOf(obj, owner);
}
-void ScummEngine_c64::resetSentence() {
+void ScummEngine_v0::resetSentence() {
_activeInventory = 0;
_activeObject = 0;
_activeVerb = 13;
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2007-02-25 08:37:15 UTC (rev 25849)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2007-02-25 11:38:19 UTC (rev 25850)
@@ -669,7 +669,7 @@
VAR_CLICK_OBJECT = 0xFF;
}
-ScummEngine_c64::ScummEngine_c64(OSystem *syst, const DetectorResult &dr)
+ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
: ScummEngine_v2(syst, dr) {
_currentMode = 0;
@@ -1425,7 +1425,7 @@
_lastSaveTime = _system->getMillis();
}
-void ScummEngine_c64::resetScumm() {
+void ScummEngine_v0::resetScumm() {
ScummEngine_v2::resetScumm();
initC64Verbs();
}
Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp 2007-02-25 08:37:15 UTC (rev 25849)
+++ scummvm/trunk/engines/scumm/vars.cpp 2007-02-25 11:38:19 UTC (rev 25850)
@@ -106,7 +106,7 @@
}
}
-void ScummEngine_c64::setupScummVars() {
+void ScummEngine_v0::setupScummVars() {
VAR_EGO = 0;
VAR_CAMERA_POS_X = 2;
VAR_HAVE_MSG = 3;
@@ -536,7 +536,7 @@
}
#endif
-void ScummEngine_c64::resetScummVars() {
+void ScummEngine_v0::resetScummVars() {
_activeInventory = 0;
_activeObject = 0;
_activeVerb = 13;
Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp 2007-02-25 08:37:15 UTC (rev 25849)
+++ scummvm/trunk/engines/scumm/verbs.cpp 2007-02-25 11:38:19 UTC (rev 25850)
@@ -83,7 +83,7 @@
{15, 23, 2, 0, "Benutz"}
};
-void ScummEngine_c64::initC64Verbs() {
+void ScummEngine_v0::initC64Verbs() {
VirtScreen *virt = &virtscr[kVerbVirtScreen];
VerbSlot *vs;
int i;
@@ -464,7 +464,7 @@
checkV2MouseOver(_mouse);
}
-void ScummEngine_c64::handleMouseOver(bool updateInventory) {
+void ScummEngine_v0::handleMouseOver(bool updateInventory) {
ScummEngine_v2::handleMouseOver(updateInventory);
drawSentence();
@@ -560,7 +560,7 @@
_activeVerb = 13;
}
-void ScummEngine_c64::checkExecVerbs() {
+void ScummEngine_v0::checkExecVerbs() {
Actor *a;
VirtScreen *zone = findVirtScreen(_mouse.y);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list