diff options
author | Denis Kasak | 2009-07-13 19:53:53 +0000 |
---|---|---|
committer | Denis Kasak | 2009-07-13 19:53:53 +0000 |
commit | 04e4bfdbbed01d71f3d5c74d4e3a2090430a1b35 (patch) | |
tree | d1bb18cdd79b0cd58a335b0dffac2a093ba1fecf /engines/draci/game.cpp | |
parent | f8c20b9e9c68dc670ddb0179abed6dc12509c244 (diff) | |
download | scummvm-rg350-04e4bfdbbed01d71f3d5c74d4e3a2090430a1b35.tar.gz scummvm-rg350-04e4bfdbbed01d71f3d5c74d4e3a2090430a1b35.tar.bz2 scummvm-rg350-04e4bfdbbed01d71f3d5c74d4e3a2090430a1b35.zip |
* Implemented the following GPL functions: IsIcoOn, IcoStat, IsObjOn, IsObjOff, IsObjAway
* Changed GameObject::_location to an int since we sometimes use location -1.
* Some more uint <-> int changes to prevent comparisons between signed and unsigned.
svn-id: r42452
Diffstat (limited to 'engines/draci/game.cpp')
-rw-r--r-- | engines/draci/game.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp index 4d6c77a169..e7f1b2d454 100644 --- a/engines/draci/game.cpp +++ b/engines/draci/game.cpp @@ -144,7 +144,7 @@ void Game::init() { changeRoom(0); } -void Game::loadRoom(uint roomNum) { +void Game::loadRoom(int roomNum) { BAFile *f; f = _vm->_roomsArchive->getFile(roomNum * 4); @@ -208,7 +208,7 @@ int Game::loadAnimation(uint animNum, uint z) { BAFile *animFile = _vm->_animationsArchive->getFile(animNum); Common::MemoryReadStream animationReader(animFile->_data, animFile->_length); - int numFrames = animationReader.readByte(); + uint numFrames = animationReader.readByte(); // FIXME: handle these properly animationReader.readByte(); // Memory logic field, not used @@ -356,6 +356,10 @@ void Game::setVariable(int numVar, int value) { _variables[numVar] = value; } +int Game::getIconStatus(int iconID) { + return _iconStatus[iconID]; +} + Game::~Game() { delete[] _persons; delete[] _variables; |