From 359d374dc6122a97172827e82246126704bbc799 Mon Sep 17 00:00:00 2001 From: Robert Špalek Date: Mon, 28 Sep 2009 04:09:03 +0000 Subject: Added const's to getPalette() and several uses of getObject() svn-id: r44434 --- engines/draci/game.cpp | 9 +++++---- engines/draci/screen.cpp | 2 +- engines/draci/screen.h | 2 +- engines/draci/script.cpp | 20 ++++++++++---------- 4 files changed, 17 insertions(+), 16 deletions(-) (limited to 'engines/draci') diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp index 98442a26ee..01820ace6b 100644 --- a/engines/draci/game.cpp +++ b/engines/draci/game.cpp @@ -249,7 +249,7 @@ void Game::init() { loadObject(kDragonObject); - GameObject *dragon = getObject(kDragonObject); + const GameObject *dragon = getObject(kDragonObject); debugC(4, kDraciLogicDebugLevel, "Running init program for the dragon object..."); _vm->_script->run(dragon->_program, dragon->_init); @@ -1148,9 +1148,10 @@ void Game::loadRoom(int roomNum) { // other objects that may not yet be loaded for (uint i = 0; i < _info._numObjects; ++i) { if (_objects[i]._location == roomNum) { + const GameObject *obj = getObject(i); debugC(6, kDraciLogicDebugLevel, - "Running init program for object %d (offset %d)", i, getObject(i)->_init); - _vm->_script->run(getObject(i)->_program, getObject(i)->_init); + "Running init program for object %d (offset %d)", i, obj->_init); + _vm->_script->run(obj->_program, obj->_init); } } @@ -1345,7 +1346,7 @@ void Game::changeRoom(uint roomNum) { int oldRoomNum = _currentRoom._roomNum; // TODO: Make objects capable of stopping their own animations - GameObject *dragon = getObject(kDragonObject); + const GameObject *dragon = getObject(kDragonObject); for (uint i = 0; i < dragon->_anims.size(); ++i) { _vm->_anims->stop(dragon->_anims[i]); } diff --git a/engines/draci/screen.cpp b/engines/draci/screen.cpp index 95673ca1cb..ad91157218 100644 --- a/engines/draci/screen.cpp +++ b/engines/draci/screen.cpp @@ -167,7 +167,7 @@ void Screen::drawRect(Common::Rect r, uint8 colour) { * @brief Fetches the current palette * @return A byte pointer to the current palette */ -byte *Screen::getPalette() const { +const byte *Screen::getPalette() const { return _palette; } diff --git a/engines/draci/screen.h b/engines/draci/screen.h index a9f385d3c6..2efa6625df 100644 --- a/engines/draci/screen.h +++ b/engines/draci/screen.h @@ -48,7 +48,7 @@ public: void setPaletteEmpty(unsigned int numEntries = kNumColours); void setPalette(const byte *data, uint16 start, uint16 num); - byte *getPalette() const; + const byte *getPalette() const; void copyToScreen(); void clearScreen(); void fillScreen(uint8 colour); diff --git a/engines/draci/script.cpp b/engines/draci/script.cpp index ea9d14f31d..2383138828 100644 --- a/engines/draci/script.cpp +++ b/engines/draci/script.cpp @@ -282,7 +282,7 @@ int Script::funcActIco(int itemID) const { int Script::funcIsObjOn(int objID) const { objID -= 1; - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); return obj->_visible; } @@ -290,7 +290,7 @@ int Script::funcIsObjOn(int objID) const { int Script::funcIsObjOff(int objID) const { objID -= 1; - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); // We index locations from 0 (as opposed to the original player where it was from 1) // That's why the "away" location 0 from the data files is converted to -1 @@ -300,7 +300,7 @@ int Script::funcIsObjOff(int objID) const { int Script::funcObjStat(int objID) const { objID -= 1; - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); if (obj->_location == _vm->_game->getRoomNum()) { if (obj->_visible) { @@ -316,7 +316,7 @@ int Script::funcObjStat(int objID) const { int Script::funcIsObjAway(int objID) const { objID -= 1; - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); // see Script::funcIsObjOff return !obj->_visible && obj->_location == -1; @@ -333,7 +333,7 @@ int Script::funcActPhase(int objID) const { return ret; } - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); bool visible = (obj->_location == _vm->_game->getRoomNum() && obj->_visible); @@ -404,7 +404,7 @@ void Script::start(Common::Queue ¶ms) { int objID = params.pop() - 1; int animID = params.pop() - 1; - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); // Stop all animation that the object owns @@ -430,7 +430,7 @@ void Script::startPlay(Common::Queue ¶ms) { int objID = params.pop() - 1; int animID = params.pop() - 1; - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); // Stop all animation that the object owns @@ -586,7 +586,7 @@ void Script::execInit(Common::Queue ¶ms) { int objID = params.pop() - 1; - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); run(obj->_program, obj->_init); } @@ -597,7 +597,7 @@ void Script::execLook(Common::Queue ¶ms) { int objID = params.pop() - 1; - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); run(obj->_program, obj->_look); } @@ -608,7 +608,7 @@ void Script::execUse(Common::Queue ¶ms) { int objID = params.pop() - 1; - GameObject *obj = _vm->_game->getObject(objID); + const GameObject *obj = _vm->_game->getObject(objID); run(obj->_program, obj->_use); } -- cgit v1.2.3