libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-25 04:01:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: COMI: Implement remaining banners for demo

Browse Source
This commit is contained in:
AndywinXp 2022-07-05 09:41:05 +02:00 committed by Lothar Serra Mari
parent e01ea96054
commit 85d3c5f5ac
3 changed files with 141 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/scumm/dialogs.cpp
View File

@ -60,7 +60,7 @@ static const ResString string_map_table_v8[] = {
{0, "/BT__004/Error reading disk %c, (%c%d) Press Button."},
{0, "/BT__002/Game Paused. Press SPACE to Continue."},
{0, "/BT__005/Are you sure you want to restart? (Y/N)"}, //BOOT.004
{0, "/BT__006/Are you sure you want to quit? (Y/N)"}, //BOOT.005
{0, "/BT__006/Are you sure you want to quit? (Y/N)"}, //BOOT.005
{0, "/BT__008/Save"},
{0, "/BT__009/Load"},
{0, "/BT__010/Play"},
@ -84,6 +84,11 @@ static const ResString string_map_table_v8[] = {
{0, "/BT_105/Text Display Only"},
{0, "/BT_103/Voice Only"},
{0, "/SYST300/y"},
{0, "/BOOT.005/Are you sure you want to quit? (Y-N)"}, // Demo strings
{0, "/NEW.23/Text Speed Slow ========== Fast"},
{0, "/NEW.24/Music Volume Low ========= High"},
{0, "/NEW.25/Voice Volume Low ========= High"},
{0, "/NEW.26/Sfx Volume Low ========= High"}
};
static const ResString string_map_table_v7[] = {

136
engines/scumm/input.cpp
View File

@ -397,6 +397,8 @@ void ScummEngine::processInput() {
#ifdef ENABLE_SCUMM_7_8
void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
char tempStr[64];
// F1 (the trigger for the original save/load dialog) is mapped to F5,
// unless we chose to use the original GUI.
if (!(_game.features & GF_DEMO) && lastKeyHit.keycode == Common::KEYCODE_F1 && lastKeyHit.hasFlags(0)) {
@ -451,7 +453,8 @@ void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
if (isUsingOriginalGUI() &&
(lastKeyHit.keycode == Common::KEYCODE_c && lastKeyHit.hasFlags(Common::KBD_CTRL))) {
if (_game.features & GF_DEMO) {
Common::KeyState ks = showBannerAndPause(0, -1, d.getPlainEngineString(6));
// "Are you sure you want to quit? (Y-N)"
Common::KeyState ks = showBannerAndPause(0, -1, d.getPlainEngineString(30));
if (ks.keycode == Common::KEYCODE_y) {
quitGame();
}
@ -505,6 +508,137 @@ void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
return;
}
// "Music Volume Low ========= High"
if (isUsingOriginalGUI() &&
(lastKeyHit.keycode == Common::KEYCODE_o || lastKeyHit.keycode == Common::KEYCODE_p)) {
Common::KeyState ks = lastKeyHit;
int volume = _imuseDigital->diMUSEGetMusicGroupVol();
do {
if (ks.keycode == Common::KEYCODE_o) {
volume -= 16;
if (volume < 0)
volume = 0;
} else {
volume += 16;
if (volume > 127)
volume = 127;
}
strcpy_s(tempStr, d.getPlainEngineString(32));
char *ptrToChar = strchr(tempStr, '=');
memset(ptrToChar, '\v', 9);
ptrToChar[volume / 15] = '\f';
showBannerAndPause(0, 0, tempStr);
ks = Common::KEYCODE_INVALID;
bool leftBtnPressed = false, rightBtnPressed = false;
waitForBannerInput(60, ks, leftBtnPressed, rightBtnPressed);
} while (ks.keycode == Common::KEYCODE_o || ks.keycode == Common::KEYCODE_p);
clearBanner();
_imuseDigital->diMUSESetMusicGroupVol(volume);
return;
}
// "Voice Volume Low ========= High"
if (isUsingOriginalGUI() &&
(lastKeyHit.keycode == Common::KEYCODE_k || lastKeyHit.keycode == Common::KEYCODE_l)) {
Common::KeyState ks = lastKeyHit;
int volume = _imuseDigital->diMUSEGetVoiceGroupVol();
do {
if (ks.keycode == Common::KEYCODE_k) {
volume -= 16;
if (volume < 0)
volume = 0;
} else {
volume += 16;
if (volume > 127)
volume = 127;
}
strcpy_s(tempStr, d.getPlainEngineString(33));
char *ptrToChar = strchr(tempStr, '=');
memset(ptrToChar, '\v', 9);
ptrToChar[volume / 15] = '\f';
showBannerAndPause(0, 0, tempStr);
ks = Common::KEYCODE_INVALID;
bool leftBtnPressed = false, rightBtnPressed = false;
waitForBannerInput(60, ks, leftBtnPressed, rightBtnPressed);
} while (ks.keycode == Common::KEYCODE_k || ks.keycode == Common::KEYCODE_l);
clearBanner();
_imuseDigital->diMUSESetVoiceGroupVol(volume);
return;
}
// "Sfx Volume Low ========= High"
if (isUsingOriginalGUI() &&
(lastKeyHit.keycode == Common::KEYCODE_n || lastKeyHit.keycode == Common::KEYCODE_m)) {
Common::KeyState ks = lastKeyHit;
int volume = _imuseDigital->diMUSEGetSFXGroupVol();
do {
if (ks.keycode == Common::KEYCODE_n) {
volume -= 16;
if (volume < 0)
volume = 0;
} else {
volume += 16;
if (volume > 127)
volume = 127;
}
strcpy_s(tempStr, d.getPlainEngineString(34));
char *ptrToChar = strchr(tempStr, '=');
memset(ptrToChar, '\v', 9);
ptrToChar[volume / 15] = '\f';
showBannerAndPause(0, 0, tempStr);
ks = Common::KEYCODE_INVALID;
bool leftBtnPressed = false, rightBtnPressed = false;
waitForBannerInput(60, ks, leftBtnPressed, rightBtnPressed);
} while (ks.keycode == Common::KEYCODE_n || ks.keycode == Common::KEYCODE_m);
clearBanner();
_imuseDigital->diMUSESetSFXGroupVol(volume);
return;
}
// "Text Speed Slow ========== Fast"
if (isUsingOriginalGUI() &&
(lastKeyHit.ascii == '+' || lastKeyHit.ascii == '-')) {
if (VAR_CHARINC == 0xFF)
return;
Common::KeyState ks = lastKeyHit;
int volume = _imuseDigital->diMUSEGetSFXGroupVol();
do {
if (ks.ascii == '+') {
VAR(VAR_CHARINC) -= 1;
if (VAR(VAR_CHARINC) < 0)
VAR(VAR_CHARINC) = 0;
} else {
VAR(VAR_CHARINC) += 1;
if (VAR(VAR_CHARINC) > 9)
VAR(VAR_CHARINC) = 9;
}
strcpy_s(tempStr, d.getPlainEngineString(31));
char *ptrToChar = strchr(tempStr, '=');
memset(ptrToChar, '\v', 10);
ptrToChar[9 - VAR(VAR_CHARINC)] = '\f';
showBannerAndPause(0, 0, tempStr);
ks = Common::KEYCODE_INVALID;
bool leftBtnPressed = false, rightBtnPressed = false;
waitForBannerInput(60, ks, leftBtnPressed, rightBtnPressed);
} while (ks.ascii == '+' || ks.ascii == '-');
clearBanner();
_imuseDigital->diMUSESetSFXGroupVol(volume);
return;
}
// Fall back to V7 behavior...
ScummEngine_v7::processKeyboard(lastKeyHit);
}

1
engines/scumm/script.cpp
View File

@ -29,7 +29,6 @@
#include "scumm/util.h"
#include "scumm/scumm_v0.h"
#include "scumm/scumm_v2.h"
#include "scumm/scumm_v7.h"
#include "scumm/sound.h"
#include "scumm/verbs.h"