diff options
| -rw-r--r-- | engines/gnap/datarchive.cpp | 6 | ||||
| -rw-r--r-- | engines/gnap/datarchive.h | 8 | ||||
| -rw-r--r-- | engines/gnap/gnap.h | 2 | ||||
| -rw-r--r-- | engines/gnap/scenes/group0.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engines/gnap/datarchive.cpp b/engines/gnap/datarchive.cpp index 56fd04b87d..c74766bd03 100644 --- a/engines/gnap/datarchive.cpp +++ b/engines/gnap/datarchive.cpp @@ -47,9 +47,9 @@ DatArchive::DatArchive(const char *filename) { _entries = new DatEntry[_entriesCount]; for (int i = 0; i < _entriesCount; ++i) { _entries[i]._ofs = _fd->readUint32LE(); - _entries[i]._outSize1 = _fd->readUint32LE(); - _entries[i]._type = _fd->readUint32LE(); - _entries[i]._outSize2 = _fd->readUint32LE(); + _entries[i]._outSize1 = _fd->readUint32LE(); + _entries[i]._type = _fd->readUint32LE(); + _entries[i]._outSize2 = _fd->readUint32LE(); } } diff --git a/engines/gnap/datarchive.h b/engines/gnap/datarchive.h index 10021a0e6d..e9220f8e6f 100644 --- a/engines/gnap/datarchive.h +++ b/engines/gnap/datarchive.h @@ -36,10 +36,10 @@ namespace Gnap { struct DatEntry { - uint32 _ofs; - uint32 _outSize1; - uint32 _type; - uint32 _outSize2; + uint32 _ofs; + uint32 _outSize1; + uint32 _type; + uint32 _outSize2; }; class DatArchive { diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h index e593c749f6..7aa2221b1e 100644 --- a/engines/gnap/gnap.h +++ b/engines/gnap/gnap.h @@ -93,7 +93,7 @@ enum GnapDebugChannels { }; enum { - SF_NONE = 0x0000, + SF_NONE = 0x0000, SF_LOOK_CURSOR = 0x0001, SF_GRAB_CURSOR = 0x0002, SF_TALK_CURSOR = 0x0004, diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp index c7792af531..25e0aaebe0 100644 --- a/engines/gnap/scenes/group0.cpp +++ b/engines/gnap/scenes/group0.cpp @@ -2297,8 +2297,8 @@ void Scene06::updateHotspots() { _vm->setHotspot(kHS06WalkArea4, 475, 469, 800, 505); _vm->setHotspot(kHS06WalkArea5, 0, 0, 800, 504); _vm->setDeviceHotspot(kHS06Device, -1, -1, -1, -1); - if (_vm->isFlag(kGFGasTaken)) - _vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED; + if (_vm->isFlag(kGFGasTaken)) + _vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED; if (_vm->_cursorValue == 4) { _vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED; _vm->_hotspots[kHS06Gas]._flags = SF_DISABLED; |