diff options
| author | Max Horn | 2006-09-17 22:22:50 +0000 |
|---|---|---|
| committer | Max Horn | 2006-09-17 22:22:50 +0000 |
| commit | fab33bf6639d72776b1818131724af6d1a67ce58 (patch) | |
| tree | 8bf40c98040a3fdd58b326483008715a92a53fde /engines/scumm/scumm.h | |
| parent | f4759feeab02a470c428be8ab4add26eb2255c41 (diff) | |
| download | scummvm-rg350-fab33bf6639d72776b1818131724af6d1a67ce58.tar.gz scummvm-rg350-fab33bf6639d72776b1818131724af6d1a67ce58.tar.bz2 scummvm-rg350-fab33bf6639d72776b1818131724af6d1a67ce58.zip | |
Moved stored flobjects to class ScummEngine_v70he
svn-id: r23924
Diffstat (limited to 'engines/scumm/scumm.h')
| -rw-r--r-- | engines/scumm/scumm.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 9d51d504b5..91d9cc3f33 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -432,7 +432,6 @@ public: VerbSlot *_verbs; ObjectData *_objs; - ObjectData *_storedFlObjects; ScummDebugger *_debugger; // Core variables @@ -582,7 +581,6 @@ protected: int _numNewNames, _numGlobalScripts; int _numRoomVariables; int _numPalettes, _numSprites, _numTalkies, _numUnk; - int _numStoredFlObjects; int _HEHeapSize; public: int _numLocalScripts, _numImages, _numRooms, _numScripts, _numSounds; // Used by HE games @@ -800,10 +798,7 @@ protected: virtual void setupRoomSubBlocks(); virtual void resetRoomSubBlocks(); - void storeFlObject(int slot); - void restoreFlObjects(); - - void clearRoomObjects(); + virtual void clearRoomObjects(); virtual void resetRoomObjects(); virtual void resetRoomObject(ObjectData *od, const byte *room, const byte *searchptr = NULL); @@ -838,7 +833,7 @@ public: protected: void markObjectRectAsDirty(int obj); - void loadFlObject(uint object, uint room); + virtual void loadFlObject(uint object, uint room); void nukeFlObjects(int min, int max); int findFlObjectSlot(); int findLocalObjectSlot(); |