diff options
| -rw-r--r-- | engines/fullpipe/objects.h | 4 | ||||
| -rw-r--r-- | engines/fullpipe/stateloader.cpp | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/engines/fullpipe/objects.h b/engines/fullpipe/objects.h index be12424a33..49349f626c 100644 --- a/engines/fullpipe/objects.h +++ b/engines/fullpipe/objects.h @@ -405,8 +405,7 @@ class BigPicture { Picture pic; }; -class CInventory2 : public CObject { - CInventory _inventory; +class CInventory2 : public CInventory { InventoryItems _inventoryItems; InventoryIcons _inventoryIcons; int _selectedId; @@ -420,7 +419,6 @@ class CInventory2 : public CObject { public: CInventory2(); bool loadPartial(MfcArchive &file); - virtual bool load(MfcArchive &file); }; struct PreloadItem { diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp index 781fab2662..99f25d4e04 100644 --- a/engines/fullpipe/stateloader.cpp +++ b/engines/fullpipe/stateloader.cpp @@ -234,10 +234,6 @@ CInventory2::CInventory2() { _topOffset = -65; } -bool CInventory2::load(MfcArchive &file) { - return _inventory.load(file); -} - bool CInventory2::loadPartial(MfcArchive &file) { // CInventory2_SerializePartially int numInvs = file.readUint32LE(); |