diff options
| -rw-r--r-- | insane.cpp | 2 | ||||
| -rw-r--r-- | resource.cpp | 15 | ||||
| -rw-r--r-- | scumm.h | 5 | ||||
| -rw-r--r-- | scummvm.cpp | 4 |
4 files changed, 3 insertions, 23 deletions
diff --git a/insane.cpp b/insane.cpp index 4c19a426ad..c9f2a8033b 100644 --- a/insane.cpp +++ b/insane.cpp @@ -1036,8 +1036,6 @@ void SmushPlayer::startVideo(short int arg, byte *videoFile) sm->videoFinished = 0; sm->_insaneState = 1; - sm->delta = 5; - do { _frameChanged = 1; diff --git a/resource.cpp b/resource.cpp index 12bb6697a4..7aef5d4dfb 100644 --- a/resource.cpp +++ b/resource.cpp @@ -1235,22 +1235,11 @@ void Scumm::allocateArrays() -uint32 Scumm::isGlobInMemory(int type, int index) - +bool Scumm::isGlobInMemory(int type, int index) { - validateResource("isGlobInMemory",type,index); - - - if(res.address[type][index]==NULL) - - return(0); - - - - return(1); - + return res.address[type][index] != NULL; } @@ -556,7 +556,6 @@ public: /* Scumm main loop */ void mainRun(); - int delta; // global time /* _insane vars */ @@ -741,8 +740,6 @@ public: void stopObjectCode(); void stopObjectScript(int script); - - /* Should be in Resource class */ byte _encbyte; void *_fileHandle; @@ -783,7 +780,7 @@ public: void loadRoomObjectsSmall(); void readArrayFromIndexFile(); void readMAXS(); - uint32 isGlobInMemory(int type, int index); + bool isGlobInMemory(int type, int index); virtual void readIndexFile(); virtual void loadCharset(int i); void nukeCharset(int i); diff --git a/scummvm.cpp b/scummvm.cpp index a6b12d9c4a..8ef8740ec5 100644 --- a/scummvm.cpp +++ b/scummvm.cpp @@ -1450,16 +1450,12 @@ Scumm *Scumm::createFromDetector(GameDetector *detector, OSystem *syst) scumm->_imuse = imuse; } - scumm->delta = 6; if (detector->_restore) { scumm->_saveLoadSlot = 0; scumm->_saveLoadFlag = 2; scumm->_saveLoadCompatible = false; } - scumm->delta = 0; - - return scumm; } |