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

SCUMM: fix rtl feature

Browse Source
This commit is contained in:
athrxx 2022-08-30 01:30:54 +02:00
parent 537e6043f2
commit 7cf77ce865
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
engines/scumm/gfx_gui.cpp
View File

@ -612,7 +612,7 @@ int ScummEngine::getInternalGUIControlFromCoordinates(int x, int y) {
#ifdef ENABLE_SCUMM_7_8
void ScummEngine_v7::queryQuit() {
void ScummEngine_v7::queryQuit(bool returnToLauncher) {
if (isUsingOriginalGUI()) {
if (_game.version == 8 && !(_game.features & GF_DEMO)) {
int boxWidth, strWidth;
@ -765,7 +765,13 @@ void ScummEngine_v7::queryQuit() {
ctrlId = getInternalGUIControlFromCoordinates(_mouse.x, _mouse.y);
if ((leftBtnPressed && ctrlId == 0) || (toupper(ks.ascii) == yesLabelPtr[0])) {
_quitByGUIPrompt = true;
quitGame();
if (returnToLauncher) {
Common::Event event;
event.type = Common::EVENT_RETURN_TO_LAUNCHER;
getEventManager()->pushEvent(event);
} else {
quitGame();
};
}
// Restore the previous cursor...
@ -807,7 +813,7 @@ void ScummEngine_v7::queryQuit() {
_comiQuitMenuIsOpen = false;
_messageBannerActive = false;
} else {
ScummEngine::queryQuit();
ScummEngine::queryQuit(returnToLauncher);
}
} else {
ScummEngine::confirmExitDialog();
@ -1236,7 +1242,7 @@ int ScummEngine::getSFXVolume() {
return CLIP<int>(_mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType) / 2, 0, 127);
}
void ScummEngine::queryQuit() {
void ScummEngine::queryQuit(bool returnToLauncher) {
char msgLabelPtr[512];
char localizedYesKey;
@ -1260,7 +1266,13 @@ void ScummEngine::queryQuit() {
(ks.keycode == Common::KEYCODE_c && ks.hasFlags(Common::KBD_CTRL)) ||
(ks.keycode == Common::KEYCODE_x && ks.hasFlags(Common::KBD_ALT))) {
_quitByGUIPrompt = true;
quitGame();
if (returnToLauncher) {
Common::Event event;
event.type = Common::EVENT_RETURN_TO_LAUNCHER;
getEventManager()->pushEvent(event);
} else {
quitGame();
}
}
}
}
@ -1621,8 +1633,6 @@ void ScummEngine::showMainMenu() {
if (shouldQuit() && !_quitByGUIPrompt) {
clearClickedStatus();
getEventManager()->resetQuit();
getEventManager()->resetReturnToLauncher();
if (executeMainMenuOperation(GUI_CTRL_QUIT_BUTTON, 0, 0, hasLoadedState) || _quitByGUIPrompt)
break;
}
@ -1683,6 +1693,7 @@ bool ScummEngine::executeMainMenuOperation(int op, int mouseX, int mouseY, bool
int curSlot;
bool isLoomVga = (_game.id == GID_LOOM && _game.version == 4);
size_t labelSkip = (_game.version == 4 && _game.id != GID_LOOM) ? 0 : 4;
bool rtlRequest = getEventManager()->shouldReturnToLauncher();
switch (op) {
case GUI_CTRL_SAVE_BUTTON:
@ -1704,7 +1715,9 @@ bool ScummEngine::executeMainMenuOperation(int op, int mouseX, int mouseY, bool
case GUI_CTRL_PLAY_BUTTON:
return true;
case GUI_CTRL_QUIT_BUTTON:
queryQuit();
getEventManager()->resetQuit();
getEventManager()->resetReturnToLauncher();
queryQuit(rtlRequest);
if (_game.version == 7)
return true;
break;

3
engines/scumm/input.cpp
View File

@ -251,12 +251,13 @@ void ScummEngine::parseEvent(Common::Event event) {
case Common::EVENT_QUIT:
if (isUsingOriginalGUI()) {
if (!_quitByGUIPrompt && !_mainMenuIsActive) {
bool exitType = (event.type == Common::EVENT_RETURN_TO_LAUNCHER);
// If another message banner is currently on the screen, close it
// and then execute the quit prompt. Otherwise, prompt the user.
getEventManager()->resetQuit();
getEventManager()->resetReturnToLauncher();
if (!_messageBannerActive) {
queryQuit();
queryQuit(exitType);
_closeBannerAndQueryQuitFlag = false;
} else {
_closeBannerAndQueryQuitFlag = true;

2
engines/scumm/scumm.h
View File

@ -666,7 +666,7 @@ protected:
int getInternalGUIControlFromCoordinates(int x, int y);
virtual bool isSmushActive() { return false; }
virtual void queryQuit();
virtual void queryQuit(bool returnToLauncher);
virtual void queryRestart();
virtual const char *getGUIString(int stringId);
void waitForBannerInput(int32 waitTime, Common::KeyState &ks, bool &leftBtnClicked, bool &rightBtnClicked, bool handeleMouseWheel = false);

2
engines/scumm/scumm_v7.h
View File

@ -142,7 +142,7 @@ protected:
void loadLanguageBundle() override;
void playSpeech(const byte *ptr);
void queryQuit() override;
void queryQuit(bool returnToLauncher) override;
int getBannerColor(int bannerId) override;
const char *getGUIString(int stringId) override;
int getGUIStringHeight(const char *str) override;