diff options
| author | Filippos Karapetis | 2019-08-16 14:14:51 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-08-16 14:16:43 +0300 |
| commit | 878675cbd0487b2064abdd452006fdcfb8d6896d (patch) | |
| tree | d40e7acbdb63a720afba267d50806d735f525f11 /engines/startrek/rooms | |
| parent | 2b6d58cbb202a01c99bc0d6c2318802591ac7492 (diff) | |
| download | scummvm-rg350-878675cbd0487b2064abdd452006fdcfb8d6896d.tar.gz scummvm-rg350-878675cbd0487b2064abdd452006fdcfb8d6896d.tar.bz2 scummvm-rg350-878675cbd0487b2064abdd452006fdcfb8d6896d.zip | |
STARTREK: Simplify screen name code and add the "actions" debug command
- The screen name and map name code have been merged and simplified
- Some usage of SharedPtr has been adapted
- Duplicate code for loading the room map has been merged
- The "actions" command has been imported from the tools code
- Cleanup
Diffstat (limited to 'engines/startrek/rooms')
| -rw-r--r-- | engines/startrek/rooms/demon4.cpp | 4 | ||||
| -rw-r--r-- | engines/startrek/rooms/demon6.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/startrek/rooms/demon4.cpp b/engines/startrek/rooms/demon4.cpp index 515946bc0d..848500d06c 100644 --- a/engines/startrek/rooms/demon4.cpp +++ b/engines/startrek/rooms/demon4.cpp @@ -527,8 +527,8 @@ done: _vm->_gfx->fadeoutScreen(); _vm->_gfx->popSprites(); - _vm->_gfx->loadPri(_vm->_screenName); - _vm->_gfx->setBackgroundImage(_vm->_gfx->loadBitmap(_vm->_screenName)); + _vm->_gfx->loadPri(_vm->getScreenName()); + _vm->_gfx->setBackgroundImage(_vm->_gfx->loadBitmap(_vm->getScreenName())); _vm->_gfx->copyBackgroundScreen(); _vm->_gfx->forceDrawAllSprites(); diff --git a/engines/startrek/rooms/demon6.cpp b/engines/startrek/rooms/demon6.cpp index 1f6cfd6b5b..379c26fbe5 100644 --- a/engines/startrek/rooms/demon6.cpp +++ b/engines/startrek/rooms/demon6.cpp @@ -488,8 +488,8 @@ int Room::demon6ShowCase(int visible) { _vm->_gfx->fadeoutScreen(); _vm->_gfx->popSprites(); - _vm->_gfx->loadPri(_vm->_screenName); - _vm->_gfx->setBackgroundImage(_vm->_gfx->loadBitmap(_vm->_screenName)); + _vm->_gfx->loadPri(_vm->getScreenName()); + _vm->_gfx->setBackgroundImage(_vm->_gfx->loadBitmap(_vm->getScreenName())); _vm->_gfx->copyBackgroundScreen(); _vm->_gfx->forceDrawAllSprites(); |