diff options
author | Filippos Karapetis | 2019-10-29 00:13:57 +0200 |
---|---|---|
committer | Filippos Karapetis | 2019-10-29 02:58:36 +0200 |
commit | b2d1cfa12669b4273d8be8fd4fd99e6b02db10ec (patch) | |
tree | f47fb99fb510c860b76f1bc1be2168928c30f25f /engines/startrek/room.cpp | |
parent | f93bbfd7cae334d242760f6d3681b4ae318fa981 (diff) | |
download | scummvm-rg350-b2d1cfa12669b4273d8be8fd4fd99e6b02db10ec.tar.gz scummvm-rg350-b2d1cfa12669b4273d8be8fd4fd99e6b02db10ec.tar.bz2 scummvm-rg350-b2d1cfa12669b4273d8be8fd4fd99e6b02db10ec.zip |
STARTREK: Refactored mouse cursor and bitmap handling
- Reduced usage of SharedPtr
- Simplified the mouse cursor code (normal, locked, stack handling)
- Simplified the background handling code
- Initialize the mouse cursor after the graphics are initialized
Diffstat (limited to 'engines/startrek/room.cpp')
-rw-r--r-- | engines/startrek/room.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp index a01f52f92c..71c778acc0 100644 --- a/engines/startrek/room.cpp +++ b/engines/startrek/room.cpp @@ -536,8 +536,8 @@ void Room::loadMapFile(const Common::String &name) { delete _vm->_mapFile; _vm->_mapFile = _vm->loadFile(name + ".map"); - _vm->_iwFile.reset(); - _vm->_iwFile = SharedPtr<IWFile>(new IWFile(_vm, name + ".iw")); + delete _vm->_iwFile; + _vm->_iwFile = new IWFile(_vm, name + ".iw"); } void Room::showBitmapFor5Ticks(const Common::String &bmpName, int priority) { |