libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-21 01:08:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FULLPIPE: Move PreloadItem methods where they belong

Browse Source
This commit is contained in:
Eugene Sandulenko 2013-09-14 00:14:49 +03:00
parent 1e72640cba
commit 4db215a511
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
engines/fullpipe/gameloader.cpp
View File

@ -246,7 +246,7 @@ bool CGameLoader::preloadScene(int sceneId, int entranceId) {
int idx = -1;
for (uint i = 0; i < _preloadItems.size(); i++)
if (_preloadItems[i].preloadId1 == sceneId && _preloadItems[i].preloadId2 == entranceId) {
if (_preloadItems[i]->preloadId1 == sceneId && _preloadItems[i]->preloadId2 == entranceId) {
idx = i;
break;
}
@ -258,7 +258,7 @@ bool CGameLoader::preloadScene(int sceneId, int entranceId) {
}
if (_preloadCallback) {
if (!_preloadCallback(_preloadItems[idx], 0))
if (!_preloadCallback(*_preloadItems[idx], 0))
return false;
}
@ -270,19 +270,19 @@ bool CGameLoader::preloadScene(int sceneId, int entranceId) {
unloadScene(sceneId);
if (_preloadCallback)
_preloadCallback(_preloadItems[idx], 50);
_preloadCallback(*_preloadItems[idx], 50);
loadScene(_preloadItems[idx].sceneId);
loadScene(_preloadItems[idx]->sceneId);
ExCommand *ex = new ExCommand(_preloadItems[idx].sceneId, 17, 62, 0, 0, 0, 1, 0, 0, 0);
ExCommand *ex = new ExCommand(_preloadItems[idx]->sceneId, 17, 62, 0, 0, 0, 1, 0, 0, 0);
ex->_excFlags = 2;
ex->_keyCode = _preloadItems[idx].keyCode;
ex->_keyCode = _preloadItems[idx]->keyCode;
_preloadSceneId = 0;
_preloadEntranceId = 0;
if (_preloadCallback)
_preloadCallback(_preloadItems[idx], 100);
_preloadCallback(*_preloadItems[idx], 100);
ex->postMessage();
@ -476,6 +476,26 @@ bool Sc2::load(MfcArchive &file) {
return true;
}
bool PreloadItems::load(MfcArchive &file) {
debug(5, "PreloadItems::load()");
int count = file.readCount();
resize(count);
for (int i = 0; i < count; i++) {
PreloadItem *t = new PreloadItem();
t->preloadId1 = file.readUint32LE();
t->preloadId2 = file.readUint32LE();
t->sceneId = file.readUint32LE();
t->keyCode = file.readUint32LE();
push_back(t);
}
return true;
}
CGameVar *FullpipeEngine::getGameLoaderGameVar() {
if (_gameLoader)
return _gameLoader->_gameVar;

2
engines/fullpipe/gameloader.h
View File

@ -67,7 +67,7 @@ struct PreloadItem {
bool preloadCallback(const PreloadItem &pre, int flag);
class PreloadItems : public Common::Array<PreloadItem>, public CObject {
class PreloadItems : public Common::Array<PreloadItem *>, public CObject {
public:
virtual bool load(MfcArchive &file);
};

20
engines/fullpipe/stateloader.cpp
View File

@ -143,26 +143,6 @@ GameProject::~GameProject() {
free(_headerFilename);
}
bool PreloadItems::load(MfcArchive &file) {
debug(5, "PreloadItems::load()");
int count = file.readCount();
resize(count);
for (int i = 0; i < count; i++) {
PreloadItem *t = new PreloadItem();
t->preloadId1 = file.readUint32LE();
t->preloadId2 = file.readUint32LE();
t->sceneId = file.readUint32LE();
t->keyCode = file.readUint32LE();
push_back(*t);
}
return true;
}
CGameVar::CGameVar() {
_subVars = 0;
_parentVarObj = 0;