aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2013-07-31 20:08:37 +0300
committerEugene Sandulenko2013-09-06 14:51:09 +0300
commit6e64897e725e06fe00a39629fdfd7dec35a9574f (patch)
tree2dc4f3db4390da79470b86a5732c330537aab803 /engines
parent856eb1b0fa92068fd7b61a8c9a6350af596f3f00 (diff)
downloadscummvm-rg350-6e64897e725e06fe00a39629fdfd7dec35a9574f.tar.gz
scummvm-rg350-6e64897e725e06fe00a39629fdfd7dec35a9574f.tar.bz2
scummvm-rg350-6e64897e725e06fe00a39629fdfd7dec35a9574f.zip
FULLPIPE: Rename some CGameLoader members
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/gameloader.cpp8
-rw-r--r--engines/fullpipe/gameloader.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 939da177f4..c627550275 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -62,8 +62,8 @@ CGameLoader::CGameLoader() {
_preloadCallback = 0;
_readSavegameCallback = 0;
_gameVar = 0;
- _preloadId1 = 0;
- _preloadId2 = 0;
+ _preloadSceneId = 0;
+ _preloadEntranceId = 0;
_updateCounter = 0;
g_fullpipe->_msgX = 0;
@@ -267,9 +267,9 @@ void CGameLoader::updateSystems(int counterdiff) {
processMessages();
- if (_preloadId1) {
+ if (_preloadSceneId) {
processMessages();
- preloadScene(_preloadId1, _preloadId2);
+ preloadScene(_preloadSceneId, _preloadEntranceId);
}
}
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index 4ba48297af..e1a0bac95e 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -63,8 +63,8 @@ class CGameLoader : public CObject {
char *_gameName;
ExCommand _exCommand;
int _updateCounter;
- int _preloadId1;
- int _preloadId2;
+ int _preloadSceneId;
+ int _preloadEntranceId;
};
CInventory2 *getGameLoaderInventory();