FREESCAPE: added ankh indicator for eclipse in dos/cpc

scummvm · Feb 25, 2024 · 66bc819 · 66bc819
1 parent a0f4705
commit 66bc819
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 6 deletions.
diff --git a/devtools/create_freescape/eclipse_ankh_indicator_Amstrad CPC.bmp b/devtools/create_freescape/eclipse_ankh_indicator_Amstrad CPC.bmp
diff --git a/devtools/create_freescape/eclipse_ankh_indicator_ega.bmp b/devtools/create_freescape/eclipse_ankh_indicator_ega.bmp
diff --git a/dists/engine-data/freescape.dat b/dists/engine-data/freescape.dat
diff --git a/engines/freescape/games/eclipse/cpc.cpp b/engines/freescape/games/eclipse/cpc.cpp
@@ -65,13 +65,11 @@ void EclipseEngine::loadAssetsCPCDemo() {
 	}
 	loadColorPalette();
 	swapPalette(1);
-	//_indicators.push_back(loadBundledImage("dark_fallen_indicator"));
-	//_indicators.push_back(loadBundledImage("dark_crouch_indicator"));
-	//_indicators.push_back(loadBundledImage("dark_walk_indicator"));
-	//_indicators.push_back(loadBundledImage("dark_jet_indicator"));
 
-	//for (auto &it : _indicators)
-	//	it->convertToInPlace(_gfx->_texturePixelFormat);
+	_indicators.push_back(loadBundledImage("eclipse_ankh_indicator"));
+
+	for (auto &it : _indicators)
+		it->convertToInPlace(_gfx->_texturePixelFormat);
 }
 
 void EclipseEngine::drawCPCUI(Graphics::Surface *surface) {
@@ -111,6 +109,7 @@ void EclipseEngine::drawCPCUI(Graphics::Surface *surface) {
 		drawStringInSurface("<", 240, 135, back, front, surface, 'Z' - '$' + 1);
 	}
 	drawAnalogClock(surface, 90, 172, back, other, front);
+	drawIndicator(surface, 45, 4, 12);
 }
 
 } // End of namespace Freescape
diff --git a/engines/freescape/games/eclipse/dos.cpp b/engines/freescape/games/eclipse/dos.cpp
@@ -66,6 +66,12 @@ void EclipseEngine::loadAssetsDOSFullGame() {
 		}
 		_border = load8bitBinImage(&file, 0x210);
 		_border->setPalette((byte *)&kEGADefaultPalette, 0, 16);
+
+		_indicators.push_back(loadBundledImage("eclipse_ankh_indicator"));
+
+		for (auto &it : _indicators)
+			it->convertToInPlace(_gfx->_texturePixelFormat);
+
 	} else if (_renderMode == Common::kRenderCGA) {
 		file.open("SCN1C.DAT");
 		if (file.isOpen()) {
@@ -135,6 +141,7 @@ void EclipseEngine::drawDOSUI(Graphics::Surface *surface) {
 	Common::Rect jarWater(124, 192 - _gameStateVars[k8bitVariableEnergy], 148, 192);
 	surface->fillRect(jarWater, blue);
 
+	drawIndicator(surface, 41, 4, 16);
 }
 
 soundFx *EclipseEngine::load1bPCM(Common::SeekableReadStream *file, int offset) {

diff --git a/engines/freescape/games/eclipse/eclipse.cpp b/engines/freescape/games/eclipse/eclipse.cpp
@@ -335,6 +335,17 @@ void EclipseEngine::drawAnalogClockHand(Graphics::Surface *surface, int x, int y
 	surface->drawLine(x, y, x+(int)w, y+(int)h, color);
 }
 
+void EclipseEngine::drawIndicator(Graphics::Surface *surface, int xPosition, int yPosition, int separation) {
+	if (_indicators.size() == 0)
+		return;
+
+	for (int i = 0; i < 5; i++) {
+		if (_gameStateVars[kVariableEclipseAnkhs] > i)
+			continue;
+		surface->copyRectToSurface(*_indicators[0], xPosition + separation * i, yPosition, Common::Rect(_indicators[0]->w, _indicators[0]->h));
+	}
+}
+
 void EclipseEngine::updateTimeVariables() {
 	if (_gameStateControl != kFreescapeGameStatePlaying)
 		return;

diff --git a/engines/freescape/games/eclipse/eclipse.h b/engines/freescape/games/eclipse/eclipse.h
@@ -30,6 +30,10 @@ enum EclipseReleaseFlags {
 	GF_ZX_DEMO_MICROHOBBY = (1 << 1),
 };
 
+enum {
+	kVariableEclipseAnkhs = 32,
+};
+
 class EclipseEngine : public FreescapeEngine {
 public:
 	EclipseEngine(OSystem *syst, const ADGameDescription *gd);
@@ -39,6 +43,7 @@ class EclipseEngine : public FreescapeEngine {
 	void borderScreen() override;
 	void titleScreen() override;
 	void drawInfoMenu() override;
+	void drawIndicator(Graphics::Surface *surface, int xPosition, int yPosition, int separation);
 
 	void loadAssets() override;
 	void loadAssetsDOSFullGame() override;