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

2 files changed, 5 insertions, 5 deletions

diff --git a/engines/startrek/rooms/demon4.cpp b/engines/startrek/rooms/demon4.cpp
index 848500d06c..30cfa729da 100644
--- a/engines/startrek/rooms/demon4.cpp
+++ b/engines/startrek/rooms/demon4.cpp
@@ -397,9 +397,9 @@ bool Room::demon4ShowSunPuzzle() {
 	sprites[1].setBitmap(_vm->_gfx->loadBitmap("leverr"));
 	sprites[2].setBitmap(_vm->_gfx->loadBitmap("leverb"));
 
-	SharedPtr<Bitmap> lightyBitmap = _vm->_gfx->loadBitmap("lighty");
-	SharedPtr<Bitmap> lightrBitmap = _vm->_gfx->loadBitmap("lightr");
-	SharedPtr<Bitmap> lightbBitmap = _vm->_gfx->loadBitmap("lightb");
+	SharedPtr<Bitmap> lightyBitmap = SharedPtr<Bitmap>(_vm->_gfx->loadBitmap("lighty"));
+	SharedPtr<Bitmap> lightrBitmap = SharedPtr<Bitmap>(_vm->_gfx->loadBitmap("lightr"));
+	SharedPtr<Bitmap> lightbBitmap = SharedPtr<Bitmap>(_vm->_gfx->loadBitmap("lightb"));
 
 	for (int i = 3; i < 9; i++)
 		sprites[i].bitmap = lightyBitmap;
diff --git a/engines/startrek/rooms/demon6.cpp b/engines/startrek/rooms/demon6.cpp
index 379c26fbe5..8c35a70b43 100644
--- a/engines/startrek/rooms/demon6.cpp
+++ b/engines/startrek/rooms/demon6.cpp
@@ -466,7 +466,7 @@ int Room::demon6ShowCase(int visible) {
 		sprites[i].pos.y = spritePositions[i].y;
 		sprites[i].drawPriority = 2;
 		sprites[i].bitmapChanged = true;
-		sprites[i].bitmap = _vm->_gfx->loadBitmap(Common::String::format("stlitem%d", i));
+		sprites[i].setBitmap(_vm->_gfx->loadBitmap(Common::String::format("stlitem%d", i)));
 	}
 
 	Sprite buttonSprite;
@@ -478,7 +478,7 @@ int Room::demon6ShowCase(int visible) {
 	buttonSprite.pos.y = 0x19;
 	buttonSprite.drawPriority = 2;
 	buttonSprite.bitmapChanged = true;
-	buttonSprite.bitmap = _vm->_gfx->loadBitmap("donebutt");
+	buttonSprite.setBitmap(_vm->_gfx->loadBitmap("donebutt"));
 
 	_vm->_gfx->addSprite(&buttonSprite);
 	_vm->_gfx->forceDrawAllSprites();