thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAGA2: Fix object access in scripts

Browse source
This commit is contained in:
a/ 2021-07-23 14:44:10 +09:00
parent f35039acb0
commit c9a43228b9
6 changed files with 196 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/saga2/interp.cpp
View file

@ -151,7 +151,7 @@ uint16 *builtinVTableAddress(int16 btype, uint8 *addr, CallTable **callTab) {
break; break;
case builtinTypeTAG: case builtinTypeTAG:
aItem = (ActiveItem *)addr; aItem = ((ActiveItemData *)addr)->aItem;
script = aItem->_data.scriptClassID; script = aItem->_data.scriptClassID;
*callTab = &tagCFuncs; *callTab = &tagCFuncs;
@ -161,7 +161,7 @@ uint16 *builtinVTableAddress(int16 btype, uint8 *addr, CallTable **callTab) {
break; break;
case builtinTypeMission: case builtinTypeMission:
aMission = (ActiveMission *)addr; aMission = ((ActiveMissionData *)addr)->aMission;
script = aMission->getScript(); script = aMission->getScript();
*callTab = &missionCFuncs; *callTab = &missionCFuncs;
@ -849,7 +849,7 @@ bool Thread::interpret(void) {
error("Invalid member function number"); error("Invalid member function number");
// Set up thread-specific vars // Set up thread-specific vars
thisObject = ((ObjectData *)addr)->obj; thisObject = addr;
argCount = n; argCount = n;
threadArgs.invokedObject = offset; threadArgs.invokedObject = offset;

4
engines/saga2/mission.cpp
View file

@ -57,6 +57,8 @@ ActiveMission *ActiveMission::newMission(ObjectID genID, uint16 script) {
memset(ms->_data.missionVars, 0, ARRAYSIZE(ms->_data.missionVars)); memset(ms->_data.missionVars, 0, ARRAYSIZE(ms->_data.missionVars));
ms->_data.aMission = ms;
return ms; return ms;
} }
@ -192,6 +194,8 @@ void ActiveMission::read(Common::InSaveFile *in) {
_data.numObjectIDs = in->readUint16LE(); _data.numObjectIDs = in->readUint16LE();
_data.numKnowledgeIDs = in->readUint16LE(); _data.numKnowledgeIDs = in->readUint16LE();
_data.aMission = this;
debugC(4, kDebugSaveload, "... numObjectIDs = %d", _data.numObjectIDs); debugC(4, kDebugSaveload, "... numObjectIDs = %d", _data.numObjectIDs);
debugC(4, kDebugSaveload, "... numKnowledgeIDs = %d", _data.numKnowledgeIDs); debugC(4, kDebugSaveload, "... numKnowledgeIDs = %d", _data.numKnowledgeIDs);
} }

4
engines/saga2/mission.h
View file

@ -39,6 +39,8 @@ struct KnowledgeID {
uint16 kID; uint16 kID;
}; };
class ActiveMission;
#include "common/pack-start.h" #include "common/pack-start.h"
// Mission flags // Mission flags
@ -63,6 +65,8 @@ struct ActiveMissionData {
KnowledgeID missionKnowledgeList[32]; KnowledgeID missionKnowledgeList[32];
uint16 numObjectIDs, uint16 numObjectIDs,
numKnowledgeIDs; numKnowledgeIDs;
ActiveMission *aMission; // ActiveMission this ActiveMissionData belongs to
} PACKED_STRUCT; } PACKED_STRUCT;
#include "common/pack-end.h" #include "common/pack-end.h"

360
engines/saga2/sagafunc.cpp
View file

File diff suppressed because it is too large Load diff

1
engines/saga2/tile.cpp
View file

@ -1287,6 +1287,7 @@ ActiveItem::ActiveItem(ActiveItemList *parent, int ind, Common::SeekableReadStre
_data.instance.targetV = stream->readUint16LE(); _data.instance.targetV = stream->readUint16LE();
_data.instance.targetZ = stream->readByte(); _data.instance.targetZ = stream->readByte();
_data.instance.worldNum = stream->readByte(); _data.instance.worldNum = stream->readByte();
_data.aItem = this;
} }
ActiveItemList::ActiveItemList(WorldMapData *parent, int count, Common::SeekableReadStream *stream) { ActiveItemList::ActiveItemList(WorldMapData *parent, int count, Common::SeekableReadStream *stream) {

4
engines/saga2/tile.h
View file

@ -346,6 +346,8 @@ extern byte **stateArray;
class ActiveItemList; class ActiveItemList;
class ActiveItem;
#include "common/pack-start.h" #include "common/pack-start.h"
struct ActiveItemData { struct ActiveItemData {
@ -379,6 +381,8 @@ struct ActiveItemData {
worldNum; // Add 0xf000 to get world Object ID worldNum; // Add 0xf000 to get world Object ID
} instance; } instance;
}; };
ActiveItem *aItem; // active item this ActiveItemData is a part of
} PACKED_STRUCT; } PACKED_STRUCT;
#include "common/pack-end.h" #include "common/pack-end.h"