diff options
| author | Paul Gilbert | 2014-02-01 18:55:18 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-02-01 18:55:18 -0500 |
| commit | 8af390ab9f6db6bf623b609fd424832f1acd6826 (patch) | |
| tree | a9c67a80e7095d45a758e5271419f498e63843d9 | |
| parent | d215fae7212bd4063437c02a7dfdc0fc16110798 (diff) | |
| download | scummvm-rg350-8af390ab9f6db6bf623b609fd424832f1acd6826.tar.gz scummvm-rg350-8af390ab9f6db6bf623b609fd424832f1acd6826.tar.bz2 scummvm-rg350-8af390ab9f6db6bf623b609fd424832f1acd6826.zip | |
VOYEUR: Further renaming of state Id, and merging of flag bytes
| -rw-r--r-- | engines/voyeur/files.h | 10 | ||||
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h index ba3195b1e6..1ea8428fc8 100644 --- a/engines/voyeur/files.h +++ b/engines/voyeur/files.h @@ -539,13 +539,13 @@ private: public: int _stateId; int _stackId; - int _savedStateId, _savedStackId; - byte _flags; - int _field9; + int _savedStateId; + int _savedStackId; + int _newStateId; + int _newStackId; + int _flags; int _fieldA[8]; int _field2A[8]; - int _newSceneId; - int _newStackId; int _stateFlags; int _stateCount; int _parseCount; diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index deb2e5bd89..41fc17a54a 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -53,7 +53,7 @@ void ThreadResource::initThreadStruct(int idx, int id) { if (loadAStack(idx)) { _savedStateId = _savedStackId = -1; _stateId = id; - _newSceneId = -1; + _newStateId = -1; _newStackId = -1; doState(); @@ -108,11 +108,11 @@ bool ThreadResource::doState() { } bool ThreadResource::getStateInfo() { - _field9 = 0; + _flags &= 0xff; int id = READ_LE_UINT16(_ctlPtr); if (id <= _stateId) { - _field9 |= 0x80; + _flags |= 0x8000; return false; } else { uint32 fld = READ_LE_UINT32(_ctlPtr + 2); @@ -929,14 +929,14 @@ const byte *ThreadResource::cardPerform(const byte *card) { card += 2; case 45: - _newSceneId = _field46; + _newStateId = _field46; _newStackId = _stackId; break; case 46: - _vm->_glGoScene = _newSceneId; + _vm->_glGoScene = _newStateId; _vm->_glGoStack = _newStackId; - _newSceneId = -1; + _newStateId = -1; _newStackId = -1; break; |