[Scummvm-git-logs] scummvm master -> c2883e6a92059f2116ed527beb828cf70e9c34bd
neuromancer
noreply at scummvm.org
Thu Feb 23 18:56:16 UTC 2023
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
101f4354b8 FREESCAPE: fixed image loader and read title in driller for ega and updated freescape.dat
c2883e6a92 FREESCAPE: refactored driller dos code into a directory
Commit: 101f4354b81eb287d8b2f541601846f36dae7305
https://github.com/scummvm/scummvm/commit/101f4354b81eb287d8b2f541601846f36dae7305
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-02-23T19:55:26+01:00
Commit Message:
FREESCAPE: fixed image loader and read title in driller for ega and updated freescape.dat
Changed paths:
R devtools/create_freescape/darkside_ega.bmp
R devtools/create_freescape/driller_cga_title.bmp
R devtools/create_freescape/driller_ega.bmp
R devtools/create_freescape/driller_ega_title.bmp
R devtools/create_freescape/driller_zx.bmp
R devtools/create_freescape/driller_zx_title.bmp
R devtools/create_freescape/spacestationoblivion_cga.bmp
R devtools/create_freescape/spacestationoblivion_cga_title.bmp
R devtools/create_freescape/spacestationoblivion_ega.bmp
R devtools/create_freescape/spacestationoblivion_ega_title.bmp
R devtools/create_freescape/totaleclipse_ega.bmp
devtools/create_freescape/version
dists/engine-data/freescape.dat
engines/freescape/freescape.cpp
engines/freescape/freescape.h
engines/freescape/games/driller.cpp
engines/freescape/loaders/8bitBinaryLoader.cpp
diff --git a/devtools/create_freescape/darkside_ega.bmp b/devtools/create_freescape/darkside_ega.bmp
deleted file mode 100644
index 7622c9e58b2..00000000000
Binary files a/devtools/create_freescape/darkside_ega.bmp and /dev/null differ
diff --git a/devtools/create_freescape/driller_cga_title.bmp b/devtools/create_freescape/driller_cga_title.bmp
deleted file mode 100644
index 2741613f4a5..00000000000
Binary files a/devtools/create_freescape/driller_cga_title.bmp and /dev/null differ
diff --git a/devtools/create_freescape/driller_ega.bmp b/devtools/create_freescape/driller_ega.bmp
deleted file mode 100644
index ec3df6b4bb7..00000000000
Binary files a/devtools/create_freescape/driller_ega.bmp and /dev/null differ
diff --git a/devtools/create_freescape/driller_ega_title.bmp b/devtools/create_freescape/driller_ega_title.bmp
deleted file mode 100644
index b0ad1adc1f8..00000000000
Binary files a/devtools/create_freescape/driller_ega_title.bmp and /dev/null differ
diff --git a/devtools/create_freescape/driller_zx.bmp b/devtools/create_freescape/driller_zx.bmp
deleted file mode 100644
index 6cc207a6913..00000000000
Binary files a/devtools/create_freescape/driller_zx.bmp and /dev/null differ
diff --git a/devtools/create_freescape/driller_zx_title.bmp b/devtools/create_freescape/driller_zx_title.bmp
deleted file mode 100644
index 6421d62d97c..00000000000
Binary files a/devtools/create_freescape/driller_zx_title.bmp and /dev/null differ
diff --git a/devtools/create_freescape/spacestationoblivion_cga.bmp b/devtools/create_freescape/spacestationoblivion_cga.bmp
deleted file mode 100644
index 26efd4ce64a..00000000000
Binary files a/devtools/create_freescape/spacestationoblivion_cga.bmp and /dev/null differ
diff --git a/devtools/create_freescape/spacestationoblivion_cga_title.bmp b/devtools/create_freescape/spacestationoblivion_cga_title.bmp
deleted file mode 100644
index 2cdb371cde7..00000000000
Binary files a/devtools/create_freescape/spacestationoblivion_cga_title.bmp and /dev/null differ
diff --git a/devtools/create_freescape/spacestationoblivion_ega.bmp b/devtools/create_freescape/spacestationoblivion_ega.bmp
deleted file mode 100644
index 5965512fc9e..00000000000
Binary files a/devtools/create_freescape/spacestationoblivion_ega.bmp and /dev/null differ
diff --git a/devtools/create_freescape/spacestationoblivion_ega_title.bmp b/devtools/create_freescape/spacestationoblivion_ega_title.bmp
deleted file mode 100644
index 41c667015b6..00000000000
Binary files a/devtools/create_freescape/spacestationoblivion_ega_title.bmp and /dev/null differ
diff --git a/devtools/create_freescape/totaleclipse_ega.bmp b/devtools/create_freescape/totaleclipse_ega.bmp
deleted file mode 100644
index 738d6af20b4..00000000000
Binary files a/devtools/create_freescape/totaleclipse_ega.bmp and /dev/null differ
diff --git a/devtools/create_freescape/version b/devtools/create_freescape/version
index 56a6051ca2b..d8263ee9860 100644
--- a/devtools/create_freescape/version
+++ b/devtools/create_freescape/version
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/dists/engine-data/freescape.dat b/dists/engine-data/freescape.dat
index 301c12a46c6..322725f9b14 100644
Binary files a/dists/engine-data/freescape.dat and b/dists/engine-data/freescape.dat differ
diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index 690fcff4492..1a8728e8a65 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -814,7 +814,7 @@ void FreescapeEngine::loadDataBundle() {
char *versionData = (char *)malloc((versionFile->size() + 1) * sizeof(char));
versionFile->read(versionData, versionFile->size());
versionData[versionFile->size()] = '\0';
- Common::String expectedVersion = "1";
+ Common::String expectedVersion = "2";
if (versionData != expectedVersion)
error("Unexpected version number for freescape.dat: expecting '%s' but found '%s'", expectedVersion.c_str(), versionData);
free(versionData);
diff --git a/engines/freescape/freescape.h b/engines/freescape/freescape.h
index 5a255ca3b3d..058551b1981 100644
--- a/engines/freescape/freescape.h
+++ b/engines/freescape/freescape.h
@@ -171,7 +171,7 @@ public:
void renderPixels8bitBinCGAImage(Graphics::Surface *surface, int &i, int &j, uint8 pixels, int color);
void renderPixels8bitBinEGAImage(Graphics::Surface *surface, int &i, int &j, uint8 pixels, int color);
- uint32 getPixel8bitImage(int index);
+ uint32 getPixel8bitTitleImage(int index);
Graphics::Surface *load8bitBinImage(Common::SeekableReadStream *file, int offset);
Graphics::Surface *load8bitTitleImage(Common::SeekableReadStream *file, int offset);
diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index e6de67e06f7..3c172bff970 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -667,6 +667,12 @@ void DrillerEngine::loadAssetsFullGame() {
_title = load8bitBinImage(&file, 0x0);
}
file.close();
+ file.open("EGATITLE.RL");
+ if (file.isOpen()) {
+ _title = load8bitTitleImage(&file, 0x1b3);
+ }
+ file.close();
+
file.open("DRILLE.EXE");
if (!file.isOpen())
diff --git a/engines/freescape/loaders/8bitBinaryLoader.cpp b/engines/freescape/loaders/8bitBinaryLoader.cpp
index 1f29750bbff..e22eaad1f00 100644
--- a/engines/freescape/loaders/8bitBinaryLoader.cpp
+++ b/engines/freescape/loaders/8bitBinaryLoader.cpp
@@ -323,9 +323,9 @@ byte kEGADefaultPaletteData[16][3] = {
{0x00, 0x00, 0x00}
};
-uint32 FreescapeEngine::getPixel8bitImage(int index) {
+uint32 FreescapeEngine::getPixel8bitTitleImage(int index) {
uint8 r, g, b;
- if (index < 4) {
+ if (index < 4 || _renderMode == Common::kRenderEGA) {
_gfx->readFromPalette(index, r, g, b);
return _gfx->_currentPixelFormat.ARGBToColor(0xFF, r, g, b);
}
@@ -341,35 +341,42 @@ void FreescapeEngine::renderPixels8bitTitleImage(Graphics::Surface *surface, int
return;
}
- surface->setPixel(i, j, getPixel8bitImage(c1 / 4));
- i++;
-
- if (i == 320) {
- return;
+ if (_renderMode == Common::kRenderCGA) {
+ surface->setPixel(i, j, getPixel8bitTitleImage(c1 / 4));
+ i++;
+ if (i == 320) {
+ return;
+ }
}
- surface->setPixel(i, j, getPixel8bitImage(c1));
+ surface->setPixel(i, j, getPixel8bitTitleImage(c1));
i++;
if (i == 320) {
return;
}
- surface->setPixel(i, j, getPixel8bitImage(c2 / 4));
- i++;
+ if (_renderMode == Common::kRenderCGA) {
+ surface->setPixel(i, j, getPixel8bitTitleImage(c2 / 4));
+ i++;
- if (i == 320) {
- return;
+ if (i == 320) {
+ return;
+ }
}
- surface->setPixel(i, j, getPixel8bitImage(c2));
+ surface->setPixel(i, j, getPixel8bitTitleImage(c2));
i++;
}
Graphics::Surface *FreescapeEngine::load8bitTitleImage(Common::SeekableReadStream *file, int offset) {
Graphics::Surface *surface = new Graphics::Surface();
- assert(_renderMode == Common::kRenderCGA);
- _gfx->_palette = (byte *)kCGAPalettePinkBlueWhiteData;
+ if (_renderMode == Common::kRenderCGA)
+ _gfx->_palette = (byte *)kCGAPalettePinkBlueWhiteData;
+ else if (_renderMode == Common::kRenderEGA)
+ _gfx->_palette = (byte *)kEGADefaultPaletteData;
+ else
+ error("Invalid render mode: %d", _renderMode);
surface->create(_screenW, _screenH, _gfx->_currentPixelFormat);
uint32 black = _gfx->_currentPixelFormat.ARGBToColor(0xFF, 0, 0, 0);
surface->fillRect(Common::Rect(0, 0, 320, 200), black);
Commit: c2883e6a92059f2116ed527beb828cf70e9c34bd
https://github.com/scummvm/scummvm/commit/c2883e6a92059f2116ed527beb828cf70e9c34bd
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-02-23T19:55:26+01:00
Commit Message:
FREESCAPE: refactored driller dos code into a directory
Changed paths:
A engines/freescape/games/driller/dos.cpp
A engines/freescape/games/driller/driller.cpp
R engines/freescape/games/driller.cpp
engines/freescape/freescape.h
engines/freescape/loaders/8bitBinaryLoader.cpp
engines/freescape/module.mk
diff --git a/engines/freescape/freescape.h b/engines/freescape/freescape.h
index 058551b1981..f45c683dfc4 100644
--- a/engines/freescape/freescape.h
+++ b/engines/freescape/freescape.h
@@ -165,16 +165,12 @@ public:
void load8bitBinary(Common::SeekableReadStream *file, int offset, int ncolors);
Area *load8bitArea(Common::SeekableReadStream *file, uint16 ncolors);
Object *load8bitObject(Common::SeekableReadStream *file);
- void renderPixels8bitTitleImage(Graphics::Surface *surface, int &i, int &j, int pixels);
void renderPixels8bitBinImage(Graphics::Surface *surface, int &i, int &j, uint8 pixels, int color);
void renderPixels8bitBinCGAImage(Graphics::Surface *surface, int &i, int &j, uint8 pixels, int color);
void renderPixels8bitBinEGAImage(Graphics::Surface *surface, int &i, int &j, uint8 pixels, int color);
- uint32 getPixel8bitTitleImage(int index);
Graphics::Surface *load8bitBinImage(Common::SeekableReadStream *file, int offset);
- Graphics::Surface *load8bitTitleImage(Common::SeekableReadStream *file, int offset);
-
// Areas
uint16 _startArea;
@@ -448,6 +444,10 @@ private:
void drawCPCUI(Graphics::Surface *surface);
void drawC64UI(Graphics::Surface *surface);
void drawAmigaAtariSTUI(Graphics::Surface *surface);
+
+ Graphics::Surface *load8bitTitleImage(Common::SeekableReadStream *file, int offset);
+ uint32 getPixel8bitTitleImage(int index);
+ void renderPixels8bitTitleImage(Graphics::Surface *surface, int &i, int &j, int pixels);
};
class DarkEngine : public FreescapeEngine {
diff --git a/engines/freescape/games/driller/dos.cpp b/engines/freescape/games/driller/dos.cpp
new file mode 100644
index 00000000000..ad61fa078d0
--- /dev/null
+++ b/engines/freescape/games/driller/dos.cpp
@@ -0,0 +1,254 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "freescape/freescape.h"
+#include "freescape/language/8bitDetokeniser.h"
+
+namespace Freescape {
+
+extern byte kCGAPalettePinkBlueWhiteData[4][3];
+extern byte kEGADefaultPaletteData[16][3];
+
+/*
+ The following functions are only used for decoding title images for
+ the US release of Driller ("Space Station Oblivion")
+*/
+
+uint32 DrillerEngine::getPixel8bitTitleImage(int index) {
+ uint8 r, g, b;
+ if (index < 4 || _renderMode == Common::kRenderEGA) {
+ _gfx->readFromPalette(index, r, g, b);
+ return _gfx->_currentPixelFormat.ARGBToColor(0xFF, r, g, b);
+ }
+ _gfx->readFromPalette(index / 4, r, g, b);
+ return _gfx->_currentPixelFormat.ARGBToColor(0xFF, r, g, b);
+}
+
+void DrillerEngine::renderPixels8bitTitleImage(Graphics::Surface *surface, int &i, int &j, int pixels) {
+ int c1 = pixels >> 4;
+ int c2 = pixels & 0xf;
+
+ if (i == 320) {
+ return;
+ }
+
+ if (_renderMode == Common::kRenderCGA) {
+ surface->setPixel(i, j, getPixel8bitTitleImage(c1 / 4));
+ i++;
+ if (i == 320) {
+ return;
+ }
+ }
+
+ surface->setPixel(i, j, getPixel8bitTitleImage(c1));
+ i++;
+
+ if (i == 320) {
+ return;
+ }
+
+ if (_renderMode == Common::kRenderCGA) {
+ surface->setPixel(i, j, getPixel8bitTitleImage(c2 / 4));
+ i++;
+
+ if (i == 320) {
+ return;
+ }
+ }
+
+ surface->setPixel(i, j, getPixel8bitTitleImage(c2));
+ i++;
+}
+
+Graphics::Surface *DrillerEngine::load8bitTitleImage(Common::SeekableReadStream *file, int offset) {
+ Graphics::Surface *surface = new Graphics::Surface();
+ if (_renderMode == Common::kRenderCGA)
+ _gfx->_palette = (byte *)kCGAPalettePinkBlueWhiteData;
+ else if (_renderMode == Common::kRenderEGA)
+ _gfx->_palette = (byte *)kEGADefaultPaletteData;
+ else
+ error("Invalid render mode: %d", _renderMode);
+ surface->create(_screenW, _screenH, _gfx->_currentPixelFormat);
+ uint32 black = _gfx->_currentPixelFormat.ARGBToColor(0xFF, 0, 0, 0);
+ surface->fillRect(Common::Rect(0, 0, 320, 200), black);
+
+ int i = 0;
+ int j = 0;
+ int command = -1;
+ int singlePixelsToProcess = 0;
+ bool repeatedPixelsToProcess = false;
+ file->seek(offset);
+ while (!file->eos()) {
+ assert(i <= 320);
+ int pixels = -1;
+ int repetition = -1;
+
+ if (singlePixelsToProcess == 0 && !repeatedPixelsToProcess) {
+ if (command < 0)
+ command = file->readByte();
+
+ //debug("reading command: %x at %lx", command, file->pos() - 1);
+
+ assert(command >= 0x7f);
+ singlePixelsToProcess = (0xff - command + 2) * 2;
+ //debug("single Pixels to process: %d", singlePixelsToProcess);
+
+ repeatedPixelsToProcess = true;
+ if (i == 320) {
+ j++;
+ i = 0;
+ }
+ command = -1;
+ continue;
+ }
+
+ if (singlePixelsToProcess > 0) {
+ singlePixelsToProcess--;
+ pixels = file->readByte();
+ //debug("reading pixels: %x at %d, %d", pixels, i, j);
+ renderPixels8bitTitleImage(surface, i, j, pixels);
+ } else if (repeatedPixelsToProcess) {
+ repetition = file->readByte() + 1;
+ //debug("reading repetition: %x", repetition - 1);
+ assert(repetition > 0);
+ if (repetition >= 0x80) {
+ command = repetition - 1;
+ repeatedPixelsToProcess = false;
+ continue;
+ }
+
+ if (i == 320) {
+ j++;
+ i = 0;
+ continue;
+ }
+
+ int pixels1 = file->readByte();
+ //debug("reading pixels: %x", pixels1);
+
+ int pixels2 = file->readByte();
+ //debug("reading pixels: %x", pixels2);
+
+ if (repetition >= 1) {
+ while (repetition > 0) {
+ repetition--;
+
+ if (i == 320) {
+ j++;
+ i = 0;
+ }
+
+ if (j == 200)
+ return surface;
+
+ //sdebug("repeating pixels: %x at %d, %d", pixels1, i, j);
+ renderPixels8bitTitleImage(surface, i, j, pixels1);
+
+ if (i == 320) {
+ j++;
+ i = 0;
+ }
+
+ if (j == 200)
+ return surface;
+
+ //debug("repeating pixels: %x at %d, %d", pixels2, i, j);
+ renderPixels8bitTitleImage(surface, i, j, pixels2);
+ }
+ }
+ }
+ }
+ return surface;
+}
+
+void DrillerEngine::drawDOSUI(Graphics::Surface *surface) {
+ uint32 color = _renderMode == Common::kRenderCGA ? 1 : 14;
+ uint8 r, g, b;
+
+ _gfx->readFromPalette(color, r, g, b);
+ uint32 front = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
+
+ color = _currentArea->_usualBackgroundColor;
+ if (_gfx->_colorRemaps && _gfx->_colorRemaps->contains(color)) {
+ color = (*_gfx->_colorRemaps)[color];
+ }
+
+ _gfx->readFromPalette(color, r, g, b);
+ uint32 back = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
+
+ int score = _gameStateVars[k8bitVariableScore];
+ drawStringInSurface(_currentArea->_name, 196, 185, front, back, surface);
+ drawStringInSurface(Common::String::format("%04d", int(2 * _position.x())), 150, 145, front, back, surface);
+ drawStringInSurface(Common::String::format("%04d", int(2 * _position.z())), 150, 153, front, back, surface);
+ drawStringInSurface(Common::String::format("%04d", int(2 * _position.y())), 150, 161, front, back, surface);
+ if (_playerHeightNumber >= 0)
+ drawStringInSurface(Common::String::format("%d", _playerHeightNumber), 57, 161, front, back, surface);
+ else
+ drawStringInSurface(Common::String::format("%s", "J"), 57, 161, front, back, surface);
+
+ drawStringInSurface(Common::String::format("%02d", int(_angleRotations[_angleRotationIndex])), 46, 145, front, back, surface);
+ drawStringInSurface(Common::String::format("%3d", _playerSteps[_playerStepIndex]), _renderMode == Common::kRenderCGA ? 44 : 46, 153, front, back, surface);
+ drawStringInSurface(Common::String::format("%07d", score), 238, 129, front, back, surface);
+
+ int seconds, minutes, hours;
+ getTimeFromCountdown(seconds, minutes, hours);
+ drawStringInSurface(Common::String::format("%02d", hours), 208, 8, front, back, surface);
+ drawStringInSurface(Common::String::format("%02d", minutes), 230, 8, front, back, surface);
+ drawStringInSurface(Common::String::format("%02d", seconds), 254, 8, front, back, surface);
+
+ Common::String message;
+ int deadline;
+ getLatestMessages(message, deadline);
+ if (deadline <= _countdown) {
+ drawStringInSurface(message, 190, 177, back, front, surface);
+ _temporaryMessages.push_back(message);
+ _temporaryMessageDeadlines.push_back(deadline);
+ } else {
+ if (_currentArea->_gasPocketRadius == 0)
+ message = _messagesList[2];
+ else if (_drillStatusByArea[_currentArea->getAreaID()])
+ message = _messagesList[0];
+ else
+ message = _messagesList[1];
+
+ drawStringInSurface(message, 191, 177, front, back, surface);
+ }
+
+ int energy = _gameStateVars[k8bitVariableEnergy];
+ int shield = _gameStateVars[k8bitVariableShield];
+
+ if (energy >= 0) {
+ Common::Rect backBar(20, 185, 88 - energy, 191);
+ surface->fillRect(backBar, back);
+ Common::Rect energyBar(87 - energy, 185, 88, 191);
+ surface->fillRect(energyBar, front);
+ }
+
+ if (shield >= 0) {
+ Common::Rect backBar(20, 177, 88 - shield, 183);
+ surface->fillRect(backBar, back);
+
+ Common::Rect shieldBar(87 - shield, 177, 88, 183);
+ surface->fillRect(shieldBar, front);
+ }
+}
+
+} // End of namespace Freescape
\ No newline at end of file
diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller/driller.cpp
similarity index 94%
rename from engines/freescape/games/driller.cpp
rename to engines/freescape/games/driller/driller.cpp
index 3c172bff970..06fe7489531 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller/driller.cpp
@@ -811,78 +811,6 @@ void DrillerEngine::drawUI() {
delete surface;
}
-void DrillerEngine::drawDOSUI(Graphics::Surface *surface) {
- uint32 color = _renderMode == Common::kRenderCGA ? 1 : 14;
- uint8 r, g, b;
-
- _gfx->readFromPalette(color, r, g, b);
- uint32 front = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
-
- color = _currentArea->_usualBackgroundColor;
- if (_gfx->_colorRemaps && _gfx->_colorRemaps->contains(color)) {
- color = (*_gfx->_colorRemaps)[color];
- }
-
- _gfx->readFromPalette(color, r, g, b);
- uint32 back = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
-
- int score = _gameStateVars[k8bitVariableScore];
- drawStringInSurface(_currentArea->_name, 196, 185, front, back, surface);
- drawStringInSurface(Common::String::format("%04d", int(2 * _position.x())), 150, 145, front, back, surface);
- drawStringInSurface(Common::String::format("%04d", int(2 * _position.z())), 150, 153, front, back, surface);
- drawStringInSurface(Common::String::format("%04d", int(2 * _position.y())), 150, 161, front, back, surface);
- if (_playerHeightNumber >= 0)
- drawStringInSurface(Common::String::format("%d", _playerHeightNumber), 57, 161, front, back, surface);
- else
- drawStringInSurface(Common::String::format("%s", "J"), 57, 161, front, back, surface);
-
- drawStringInSurface(Common::String::format("%02d", int(_angleRotations[_angleRotationIndex])), 46, 145, front, back, surface);
- drawStringInSurface(Common::String::format("%3d", _playerSteps[_playerStepIndex]), _renderMode == Common::kRenderCGA ? 44 : 46, 153, front, back, surface);
- drawStringInSurface(Common::String::format("%07d", score), 238, 129, front, back, surface);
-
- int seconds, minutes, hours;
- getTimeFromCountdown(seconds, minutes, hours);
- drawStringInSurface(Common::String::format("%02d", hours), 208, 8, front, back, surface);
- drawStringInSurface(Common::String::format("%02d", minutes), 230, 8, front, back, surface);
- drawStringInSurface(Common::String::format("%02d", seconds), 254, 8, front, back, surface);
-
- Common::String message;
- int deadline;
- getLatestMessages(message, deadline);
- if (deadline <= _countdown) {
- drawStringInSurface(message, 190, 177, back, front, surface);
- _temporaryMessages.push_back(message);
- _temporaryMessageDeadlines.push_back(deadline);
- } else {
- if (_currentArea->_gasPocketRadius == 0)
- message = _messagesList[2];
- else if (_drillStatusByArea[_currentArea->getAreaID()])
- message = _messagesList[0];
- else
- message = _messagesList[1];
-
- drawStringInSurface(message, 191, 177, front, back, surface);
- }
-
- int energy = _gameStateVars[k8bitVariableEnergy];
- int shield = _gameStateVars[k8bitVariableShield];
-
- if (energy >= 0) {
- Common::Rect backBar(20, 185, 88 - energy, 191);
- surface->fillRect(backBar, back);
- Common::Rect energyBar(87 - energy, 185, 88, 191);
- surface->fillRect(energyBar, front);
- }
-
- if (shield >= 0) {
- Common::Rect backBar(20, 177, 88 - shield, 183);
- surface->fillRect(backBar, back);
-
- Common::Rect shieldBar(87 - shield, 177, 88, 183);
- surface->fillRect(shieldBar, front);
- }
-}
-
void DrillerEngine::drawCPCUI(Graphics::Surface *surface) {
uint32 color = 1;
uint8 r, g, b;
diff --git a/engines/freescape/loaders/8bitBinaryLoader.cpp b/engines/freescape/loaders/8bitBinaryLoader.cpp
index e22eaad1f00..b39cd64c2e3 100644
--- a/engines/freescape/loaders/8bitBinaryLoader.cpp
+++ b/engines/freescape/loaders/8bitBinaryLoader.cpp
@@ -323,154 +323,6 @@ byte kEGADefaultPaletteData[16][3] = {
{0x00, 0x00, 0x00}
};
-uint32 FreescapeEngine::getPixel8bitTitleImage(int index) {
- uint8 r, g, b;
- if (index < 4 || _renderMode == Common::kRenderEGA) {
- _gfx->readFromPalette(index, r, g, b);
- return _gfx->_currentPixelFormat.ARGBToColor(0xFF, r, g, b);
- }
- _gfx->readFromPalette(index / 4, r, g, b);
- return _gfx->_currentPixelFormat.ARGBToColor(0xFF, r, g, b);
-}
-
-void FreescapeEngine::renderPixels8bitTitleImage(Graphics::Surface *surface, int &i, int &j, int pixels) {
- int c1 = pixels >> 4;
- int c2 = pixels & 0xf;
-
- if (i == 320) {
- return;
- }
-
- if (_renderMode == Common::kRenderCGA) {
- surface->setPixel(i, j, getPixel8bitTitleImage(c1 / 4));
- i++;
- if (i == 320) {
- return;
- }
- }
-
- surface->setPixel(i, j, getPixel8bitTitleImage(c1));
- i++;
-
- if (i == 320) {
- return;
- }
-
- if (_renderMode == Common::kRenderCGA) {
- surface->setPixel(i, j, getPixel8bitTitleImage(c2 / 4));
- i++;
-
- if (i == 320) {
- return;
- }
- }
-
- surface->setPixel(i, j, getPixel8bitTitleImage(c2));
- i++;
-}
-
-Graphics::Surface *FreescapeEngine::load8bitTitleImage(Common::SeekableReadStream *file, int offset) {
- Graphics::Surface *surface = new Graphics::Surface();
- if (_renderMode == Common::kRenderCGA)
- _gfx->_palette = (byte *)kCGAPalettePinkBlueWhiteData;
- else if (_renderMode == Common::kRenderEGA)
- _gfx->_palette = (byte *)kEGADefaultPaletteData;
- else
- error("Invalid render mode: %d", _renderMode);
- surface->create(_screenW, _screenH, _gfx->_currentPixelFormat);
- uint32 black = _gfx->_currentPixelFormat.ARGBToColor(0xFF, 0, 0, 0);
- surface->fillRect(Common::Rect(0, 0, 320, 200), black);
-
- int i = 0;
- int j = 0;
- int command = -1;
- int singlePixelsToProcess = 0;
- bool repeatedPixelsToProcess = false;
- file->seek(offset);
- while (!file->eos()) {
- assert(i <= 320);
- int pixels = -1;
- int repetition = -1;
-
- if (singlePixelsToProcess == 0 && !repeatedPixelsToProcess) {
- if (command < 0)
- command = file->readByte();
-
- //debug("reading command: %x at %lx", command, file->pos() - 1);
-
- assert(command >= 0x7f);
- singlePixelsToProcess = (0xff - command + 2) * 2;
- //debug("single Pixels to process: %d", singlePixelsToProcess);
-
- repeatedPixelsToProcess = true;
- if (i == 320) {
- j++;
- i = 0;
- }
- command = -1;
- continue;
- }
-
- if (singlePixelsToProcess > 0) {
- singlePixelsToProcess--;
- pixels = file->readByte();
- //debug("reading pixels: %x at %d, %d", pixels, i, j);
- renderPixels8bitTitleImage(surface, i, j, pixels);
- } else if (repeatedPixelsToProcess) {
- repetition = file->readByte() + 1;
- //debug("reading repetition: %x", repetition - 1);
- assert(repetition > 0);
- if (repetition >= 0x80) {
- command = repetition - 1;
- repeatedPixelsToProcess = false;
- continue;
- }
-
- if (i == 320) {
- j++;
- i = 0;
- continue;
- }
-
- int pixels1 = file->readByte();
- //debug("reading pixels: %x", pixels1);
-
- int pixels2 = file->readByte();
- //debug("reading pixels: %x", pixels2);
-
- if (repetition >= 1) {
- while (repetition > 0) {
- repetition--;
-
- if (i == 320) {
- j++;
- i = 0;
- }
-
- if (j == 200)
- return surface;
-
- //sdebug("repeating pixels: %x at %d, %d", pixels1, i, j);
- renderPixels8bitTitleImage(surface, i, j, pixels1);
-
- if (i == 320) {
- j++;
- i = 0;
- }
-
- if (j == 200)
- return surface;
-
- //debug("repeating pixels: %x at %d, %d", pixels2, i, j);
- renderPixels8bitTitleImage(surface, i, j, pixels2);
- }
- }
- }
- }
-
- return surface;
-}
-
void FreescapeEngine::renderPixels8bitBinImage(Graphics::Surface *surface, int &i, int &j, uint8 pixels, int color) {
if (i >= 320) {
//debug("cannot continue, stopping here at row %d!", j);
diff --git a/engines/freescape/module.mk b/engines/freescape/module.mk
index 556a28f6efa..52433360c8e 100644
--- a/engines/freescape/module.mk
+++ b/engines/freescape/module.mk
@@ -6,7 +6,8 @@ MODULE_OBJS := \
freescape.o \
games/castle.o \
games/dark.o \
- games/driller.o \
+ games/driller/dos.o \
+ games/driller/driller.o \
games/eclipse.o \
games/palettes.o \
gfx.o \
More information about the Scummvm-git-logs
mailing list