aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Crozat2017-11-07 23:54:41 +0000
committerThierry Crozat2018-01-23 02:15:39 +0000
commit7eb5924f65debd86f4f336db5ea7bd56f2fc72f4 (patch)
tree4dd9eea2e820ef440ad123c1f97c90c6adb138de
parent1566b6cadc2dab70b14724494448b030a0f4f6e0 (diff)
downloadscummvm-rg350-7eb5924f65debd86f4f336db5ea7bd56f2fc72f4.tar.gz
scummvm-rg350-7eb5924f65debd86f4f336db5ea7bd56f2fc72f4.tar.bz2
scummvm-rg350-7eb5924f65debd86f4f336db5ea7bd56f2fc72f4.zip
SUPERNOVA: Implement text speed dialog
The text speed is also saved in the scummvm.ini file so that it persists between runs.
-rw-r--r--engines/supernova/state.cpp2
-rw-r--r--engines/supernova/supernova.cpp57
-rw-r--r--engines/supernova/supernova.h1
3 files changed, 59 insertions, 1 deletions
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index 08c4f0efe4..7886225fd8 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -463,7 +463,7 @@ void GameManager::processInput(Common::KeyState &state) {
// show game info
break;
case Common::KEYCODE_F4:
- // set text speed
+ _vm->setTextSpeed();
break;
case Common::KEYCODE_F5:
// load/save
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index aaa898fcb6..c0b9216de1 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -115,6 +115,9 @@ SupernovaEngine::SupernovaEngine(OSystem *syst)
// const Common::FSNode gameDataDir(ConfMan.get("path"));
// SearchMan.addSubDirectoryMatching(gameDataDir, "sound");
+ if (ConfMan.hasKey("textspeed"))
+ _textSpeed = ConfMan.getInt("textspeed");
+
// setup engine specific debug channels
DebugMan.addDebugChannel(kDebugGeneral, "general", "Supernova general debug channel");
@@ -712,6 +715,60 @@ void SupernovaEngine::setColor63(byte value) {
_system->getPaletteManager()->setPalette(color, 63, 1);
}
+void SupernovaEngine::setTextSpeed() {
+ const Common::String& textSpeedString = getGameString(kStringTextSpeed);
+ int stringWidth = textWidth(textSpeedString);
+ int textX = (320 - stringWidth) / 2;
+ int textY = 100;
+ stringWidth += 4;
+ int boxX = stringWidth > 110 ? (320 - stringWidth) / 2 : 105;
+ int boxY = 97;
+ int boxWidth = stringWidth > 110 ? stringWidth : 110;
+ int boxHeight = 27;
+
+ _gm->animationOff();
+ _gm->saveTime();
+ saveScreen(boxX, boxY, boxWidth, boxHeight);
+
+ renderBox(boxX, boxY, boxWidth, boxHeight, kColorBlue);
+ renderText(textSpeedString, textX, textY, kColorWhite99); // Text speed
+
+ // Find the closest index in kTextSpeed for the current _textSpeed.
+ // Important note: values in kTextSpeed decrease with the index.
+ int speedIndex = 0;
+ while (speedIndex < 4 && _textSpeed < (kTextSpeed[speedIndex] + kTextSpeed[speedIndex+1]) / 2)
+ ++speedIndex;
+
+ char nbString[2];
+ nbString[1] = 0;
+ for (int i = 0; i < 5; ++i) {
+ byte color = i == speedIndex ? kColorWhite63 : kColorWhite35;
+ renderBox(110 + 21 * i, 111, 16, 10, color);
+
+ nbString[0] = '1' + i;
+ renderText(nbString, 115 + 21 * i, 112, kColorWhite99);
+ }
+ do {
+ _gm->getInput();
+ int key = _gm->_keyPressed ? _gm->_key.keycode : Common::KEYCODE_INVALID;
+ if (!_gm->_keyPressed && _gm->_mouseClicked && _gm->_mouseY >= 111 && _gm->_mouseY < 121 && (_gm->_mouseX + 16) % 21 < 16)
+ key = Common::KEYCODE_0 - 5 + (_gm->_mouseX + 16) / 21;
+ if (key == Common::KEYCODE_ESCAPE)
+ break;
+ else if (key >= Common::KEYCODE_1 && key <= Common::KEYCODE_5) {
+ speedIndex = key - Common::KEYCODE_1;
+ _textSpeed = kTextSpeed[speedIndex];
+ ConfMan.setInt("textspeed", _textSpeed);
+ break;
+ }
+ } while (!shouldQuit());
+ _gm->resetInputState();
+
+ restoreScreen();
+ _gm->loadTime();
+ _gm->animationOn();
+}
+
Common::MemoryReadStream *SupernovaEngine::convertToMod(const char *filename, int version) {
// MSN format
struct {
diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h
index 45705a679b..8606600019 100644
--- a/engines/supernova/supernova.h
+++ b/engines/supernova/supernova.h
@@ -143,6 +143,7 @@ public:
void command_print();
bool loadGame(int slot);
bool saveGame(int slot, const Common::String &description);
+ void setTextSpeed();
const Common::String &getGameString(int idx) const {
if (idx < 0 || idx >= (int)_gameStrings.size())