libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 04:43:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: Further renaming of state Id, and merging of flag bytes

Browse Source
This commit is contained in:
Paul Gilbert 2014-02-01 18:55:18 -05:00
parent d215fae721
commit 8af390ab9f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/voyeur/files.h
View File

@ -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;

12
engines/voyeur/files_threads.cpp
View File

@ -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;