aboutsummaryrefslogtreecommitdiff
path: root/engines/draci
diff options
context:
space:
mode:
authorDenis Kasak2009-07-17 00:27:21 +0000
committerDenis Kasak2009-07-17 00:27:21 +0000
commit8018216dea7ab54940ff8802685dd50a27522509 (patch)
treee136d6219f0cb774c56c0874df7722f551e9540d /engines/draci
parentcfa4d5eba0352128142d967434483c8c111e8160 (diff)
downloadscummvm-rg350-8018216dea7ab54940ff8802685dd50a27522509.tar.gz
scummvm-rg350-8018216dea7ab54940ff8802685dd50a27522509.tar.bz2
scummvm-rg350-8018216dea7ab54940ff8802685dd50a27522509.zip
* Renamed Room::_numMasks to _numOverlays for consistency.
* Fixed unsigned to signed comparison. svn-id: r42549
Diffstat (limited to 'engines/draci')
-rw-r--r--engines/draci/game.cpp6
-rw-r--r--engines/draci/game.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index d80408b649..7f0d2a1be1 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -174,7 +174,7 @@ void Game::loadRoom(int roomNum) {
_currentRoom._walkingMap.load(f->_data, f->_length);
_currentRoom._palette = roomReader.readByte() - 1;
- _currentRoom._numMasks = roomReader.readSint16LE();
+ _currentRoom._numOverlays = roomReader.readSint16LE();
_currentRoom._init = roomReader.readSint16LE();
_currentRoom._look = roomReader.readSint16LE();
_currentRoom._use = roomReader.readSint16LE();
@@ -192,7 +192,7 @@ void Game::loadRoom(int roomNum) {
debugC(4, kDraciLogicDebugLevel, "Music: %d", _currentRoom._music);
debugC(4, kDraciLogicDebugLevel, "Map: %d", mapIdx);
debugC(4, kDraciLogicDebugLevel, "Palette: %d", _currentRoom._palette);
- debugC(4, kDraciLogicDebugLevel, "Overlays: %d", _currentRoom._numMasks);
+ debugC(4, kDraciLogicDebugLevel, "Overlays: %d", _currentRoom._numOverlays);
debugC(4, kDraciLogicDebugLevel, "Init: %d", _currentRoom._init);
debugC(4, kDraciLogicDebugLevel, "Look: %d", _currentRoom._look);
debugC(4, kDraciLogicDebugLevel, "Use: %d", _currentRoom._use);
@@ -361,7 +361,7 @@ void Game::loadOverlays() {
Common::MemoryReadStream overlayReader(overlayHeader->_data, overlayHeader->_length);
BAFile *overlayFile;
- for (uint i = 0; i < _currentRoom._numMasks; i++) {
+ for (int i = 0; i < _currentRoom._numOverlays; i++) {
num = overlayReader.readUint16LE() - 1;
x = overlayReader.readUint16LE();
diff --git a/engines/draci/game.h b/engines/draci/game.h
index 6a4285f6b0..f843da01cf 100644
--- a/engines/draci/game.h
+++ b/engines/draci/game.h
@@ -123,7 +123,7 @@ struct Room {
byte _music;
WalkingMap _walkingMap;
byte _palette;
- int _numMasks;
+ int _numOverlays;
int _init, _look, _use, _canUse;
bool _imInit, _imLook, _imUse;
bool _mouseOn, _heroOn;