From 0ae3cbc2e8dca79ee75f235469ed26715efb0ace Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 28 Dec 2019 13:21:23 +0200
Subject: STARTREK: Reduce usage of SharedPtr, and simplify bitmap related
 calls

---
 engines/startrek/rooms/demon6.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/startrek/rooms/demon6.cpp')

diff --git a/engines/startrek/rooms/demon6.cpp b/engines/startrek/rooms/demon6.cpp
index 38e274ef41..038f66dea8 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].setBitmap(_vm->_gfx->loadBitmap(Common::String::format("stlitem%d", i)));
+		sprites[i].setBitmap(_vm->loadBitmapFile(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.setBitmap(_vm->_gfx->loadBitmap("donebutt"));
+	buttonSprite.setBitmap(_vm->loadBitmapFile("donebutt"));
 
 	_vm->_gfx->addSprite(&buttonSprite);
 	_vm->_gfx->forceDrawAllSprites();
@@ -579,8 +579,7 @@ int Room::demon6ShowCaseProcessSelection(Sprite *sprites, Sprite *clickedSprite,
 	_vm->_gfx->drawAllSprites();
 	_vm->_gfx->delSprite(clickedSprite);
 	clickedSprite->bitmap.reset();
-	int i = clickedSprite - sprites;
-	visible ^= (0x10 >> i);
+	visible ^= (0x10 >> (clickedSprite - sprites));
 	
 	return visible;
 }
-- 
cgit v1.2.3