Tile fixes with the parts dialog

Author: Gerhard Stein

src/engine/keen/vorticon/dialog/CMessageBoxVort.cpp

@@ -55,39 +55,46 @@ void CMessageBoxVort::initVorticonBackground()
 }
 
 
-// This function is used in your Ship need those parts.
+// This function is used in "Your ship need those parts".
 // This special Messagebox can hold up to 4 images
-void CMessageBoxVort::addTileAt(Uint16 tile, Uint16 x, Uint16 y)
+void CMessageBoxVort::addTileAt(const Uint16 tile, const Uint16 x, const Uint16 y)
 {
 	GsTilemap &tilemap = gGraphics.getTileMap(1);
 
 	const int tileDim = tilemap.getDimension();
 
+    auto &vidDrv = gVideoDriver;
+
 	// now we'll create a new surface on which the Tile will be printed.
-	SDL_Rect rect;
-	rect.x = rect.y = 0;
-    rect.w = rect.h = tileDim;
+    SDL_Rect tileRect;
+    tileRect.x = tileRect.y = 0;
+    tileRect.w = tileRect.h = tileDim;
 
 
-    GsSurface bmpSfc;
-    bmpSfc.createRGBSurface(rect);
-    bmpSfc.makeBlitCompatible();
+    GsSurface bmpSfcTile;
+    bmpSfcTile.createRGBSurface(tileRect);
+    bmpSfcTile.makeBlitCompatible();
 
-    bmpSfc.fillRGBA(0xFF, 0x00, 0xFF, 0xFF);
+    bmpSfcTile.fillRGBA(0xFF, 0x00, 0xFF, 0xFF);
 
-    tilemap.drawTile(bmpSfc.getSDLSurface(), 0, 0, tile);
+    tilemap.drawTile(bmpSfcTile.getSDLSurface(), 0, 0, tile);
 
-    rect.x = x+40;	rect.y = y+24;
+    tileRect.x = x+40;	tileRect.y = y+24;
 
-    GsRect<float> fRect(rect);
+    GsRect<float> fRect(tileRect);
 
     GsRect<float> scaleRect = getRect();
 
-	GsRect<float> gameRect = gVideoDriver.getGameResolution();
-    fRect.transformInverse(gameRect);    
+    GsRect<float> gameRect = vidDrv.getGameResolution();
+
+    fRect.transformInverse(gameRect);
+
+    fRect.dim.x /= scaleRect.dim.x;
+    fRect.dim.y /= scaleRect.dim.y;
+    fRect.pos.x += (scaleRect.pos.x*scaleRect.dim.x);
+    fRect.pos.y += (scaleRect.pos.y*scaleRect.dim.y);
 
-    fRect.transformInverse(scaleRect);
 
-    std::shared_ptr<GsBitmap> bmpShared(new GsBitmap(bmpSfc));
+    std::shared_ptr<GsBitmap> bmpShared(new GsBitmap(bmpSfcTile));
     add( new GsBitmapBox(bmpShared,fRect) );
 }

src/engine/keen/vorticon/dialog/CMessageBoxVort.h

@@ -24,7 +24,7 @@ class CMessageBoxVort : public CMessageBox
 	/**
 	 * \brief This will add an extra tile to the message box. Mostly used by the dialog "Ship missing" in Keen 1
 	 */
-	void addTileAt(Uint16 tile, Uint16 x, Uint16 y);
+    void addTileAt(const Uint16 tile, const Uint16 x, const Uint16 y);
 
 };
 

src/engine/keen/vorticon/playgame/CPlayGameWorldMap.cpp

@@ -182,10 +182,10 @@ void CPlayGameVorticon::YourShipNeedsTheseParts()
 	}
 
 	// draw needed parts
-    if (!joy) MessageBox->addTileAt(321,4<<3, 4<<3);
-    if (!bat) MessageBox->addTileAt(322,8<<3, 4<<3);
-    if (!vac) MessageBox->addTileAt(323,12<<3,4<<3);
-    if (!wis) MessageBox->addTileAt(324,16<<3,4<<3);
+    if (!joy) MessageBox->addTileAt(321, 4<<3,  4<<3);
+    if (!bat) MessageBox->addTileAt(322, 8<<3,  4<<3);
+    if (!vac) MessageBox->addTileAt(323, 12<<3, 4<<3);
+    if (!wis) MessageBox->addTileAt(324, 16<<3, 4<<3);
 	mMessageBoxes.push_back(move(MessageBox));
 }