libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 16:59:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Giving CollisionArea a full-blown Script pointer instead the data pointer

Browse Source 
svn-id: r41757
This commit is contained in:
Sven Hesse 2009-06-22 10:15:52 +00:00
parent 82568c66b1
commit b6a26911a3
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/gob/game.h
View File

@ -48,8 +48,7 @@ public:
uint16 funcEnter;
uint16 funcLeave;
uint16 funcSub;
byte *totFileData;
uint32 totSize;
Script *script;
} PACKED_STRUCT;
#define szGame_TotTextItem (2 + 2)

3
engines/gob/game_v1.cpp
View File

@ -280,8 +280,7 @@ int16 Game_v1::addNewCollision(int16 id, uint16 left, uint16 top,
ptr->funcEnter = funcEnter;
ptr->funcLeave = funcLeave;
ptr->funcSub = funcSub;
ptr->totFileData = 0;
ptr->totSize = 0;
ptr->script = 0;
return i;
}

3
engines/gob/game_v2.cpp
View File

@ -331,8 +331,7 @@ int16 Game_v2::addNewCollision(int16 id, uint16 left, uint16 top,
ptr->funcEnter = funcEnter;
ptr->funcLeave = funcLeave;
ptr->funcSub = funcSub;
ptr->totFileData = 0;
ptr->totSize = 0;
ptr->script = 0;
return i;
}

25
engines/gob/game_v6.cpp
View File

@ -148,8 +148,7 @@ int16 Game_v6::addNewCollision(int16 id, uint16 left, uint16 top,
ptr->funcEnter = funcEnter;
ptr->funcLeave = funcLeave;
ptr->funcSub = funcSub;
ptr->totFileData = _script->getData();
ptr->totSize = _script->getSize();
ptr->script = _script;
return i;
}
@ -925,20 +924,13 @@ void Game_v6::setCollisions(byte arg_0) {
if (collArea->flags & 0x80)
continue;
byte *totFileData = collArea->totFileData;
uint32 totSize = collArea->totSize;
Script *curScript = _script;
if (!totFileData || (totSize == 0)) {
totFileData = _script->getData();
totSize = _script->getSize();
}
_script = collArea->script;
if (!_script)
_script = curScript;
uint32 savedPos = _script->pos();
byte *savedData = _script->getData();
uint32 savedSize = _script->getSize();
_script->cuckoo(totFileData, totSize);
_script->seek(collArea->funcSub);
_script->call(collArea->funcSub);
int16 left = _script->readValExpr();
int16 top = _script->readValExpr();
@ -982,8 +974,9 @@ void Game_v6::setCollisions(byte arg_0) {
if ((collArea->id & 0xF000) == 0xA000)
collArea->flags = flags;
_script->cuckoo(savedData, savedSize);
_script->seek(savedPos);
_script->pop();
_script = curScript;
}
}