diff options
| author | Eugene Sandulenko | 2013-07-06 22:45:11 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-09-06 14:48:17 +0300 |
| commit | 69946ce96355e5e07ad7a21ab3eb2f2831dfc002 (patch) | |
| tree | 61f30acb47e094f397a34dca608d66bd41dab916 /engines/fullpipe | |
| parent | cb38892ce8dbb3841b5731554e63214803109b08 (diff) | |
| download | scummvm-rg350-69946ce96355e5e07ad7a21ab3eb2f2831dfc002.tar.gz scummvm-rg350-69946ce96355e5e07ad7a21ab3eb2f2831dfc002.tar.bz2 scummvm-rg350-69946ce96355e5e07ad7a21ab3eb2f2831dfc002.zip | |
FULLPIPE: Continued scene loading
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/gfx.h | 4 | ||||
| -rw-r--r-- | engines/fullpipe/inventory.cpp | 2 | ||||
| -rw-r--r-- | engines/fullpipe/inventory.h | 5 | ||||
| -rw-r--r-- | engines/fullpipe/stateloader.cpp | 5 |
4 files changed, 12 insertions, 4 deletions
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h index b8f6194848..6e1a3a1494 100644 --- a/engines/fullpipe/gfx.h +++ b/engines/fullpipe/gfx.h @@ -88,8 +88,10 @@ class PictureObject : public GameObject { }; class Background : public CObject { - protected: + public: CPtrList _picObjList; + + protected: char *_stringObj; int _x; int _y; diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp index 877f260e57..47f3b0d4be 100644 --- a/engines/fullpipe/inventory.cpp +++ b/engines/fullpipe/inventory.cpp @@ -72,7 +72,7 @@ bool CInventory::setItemFlags(int itemId, int flags) { CInventory2::CInventory2() { _selectedId = -1; _field_48 = -1; - _sceneObj = 0; + _scene = 0; _picture = 0; _isInventoryOut = 0; _isLocked = 0; diff --git a/engines/fullpipe/inventory.h b/engines/fullpipe/inventory.h index fadadd56b2..93f4755e79 100644 --- a/engines/fullpipe/inventory.h +++ b/engines/fullpipe/inventory.h @@ -88,7 +88,7 @@ class CInventory2 : public CInventory { int _isInventoryOut; int _isLocked; int _topOffset; - Scene *_sceneObj; + Scene *_scene; BigPicture *_picture; public: @@ -96,6 +96,9 @@ class CInventory2 : public CInventory { bool loadPartial(MfcArchive &file); void addItem(int itemId, int value); void rebuildItemRects(); + + Scene *getScene() { return _scene; } + }; } // End of namespace Fullpipe diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp index 17faba41d5..57e3921ba5 100644 --- a/engines/fullpipe/stateloader.cpp +++ b/engines/fullpipe/stateloader.cpp @@ -44,7 +44,7 @@ bool FullpipeEngine::loadGam(const char *fname) { _inventory->setItemFlags(ANI_INV_MAP, 0x10003); _inventory->addItem(ANI_INV_MAP, 1); -#if 1 +#if 0 g_fullpipe->accessScene(301); g_fullpipe->accessScene(302); g_fullpipe->accessScene(303); @@ -100,6 +100,9 @@ bool FullpipeEngine::loadGam(const char *fname) { #endif _inventory->rebuildItemRects(); + + for (CPtrList::iterator s = _inventory->getScene()->_picObjList.begin(); s != _inventory->getScene()->_picObjList.end(); ++s) { + } warning("STUB: loadGam()"); } else |