[Scummvm-cvs-logs] SF.net SVN: scummvm:[42549] scummvm/branches/gsoc2009-draci/engines/draci
dkasak13 at users.sourceforge.net
dkasak13 at users.sourceforge.net
Fri Jul 17 02:27:21 CEST 2009
Revision: 42549
http://scummvm.svn.sourceforge.net/scummvm/?rev=42549&view=rev
Author: dkasak13
Date: 2009-07-17 00:27:21 +0000 (Fri, 17 Jul 2009)
Log Message:
-----------
* Renamed Room::_numMasks to _numOverlays for consistency.
* Fixed unsigned to signed comparison.
Modified Paths:
--------------
scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
scummvm/branches/gsoc2009-draci/engines/draci/game.h
Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp 2009-07-17 00:25:27 UTC (rev 42548)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp 2009-07-17 00:27:21 UTC (rev 42549)
@@ -174,7 +174,7 @@
_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 @@
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 @@
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();
Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.h 2009-07-17 00:25:27 UTC (rev 42548)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h 2009-07-17 00:27:21 UTC (rev 42549)
@@ -123,7 +123,7 @@
byte _music;
WalkingMap _walkingMap;
byte _palette;
- int _numMasks;
+ int _numOverlays;
int _init, _look, _use, _canUse;
bool _imInit, _imLook, _imUse;
bool _mouseOn, _heroOn;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list