libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 03:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA4: Fixes for quitting ScummVM during Initiate

Browse Source
This commit is contained in:
Paul Gilbert 2020-04-24 22:17:32 -07:00
parent dd050238e8
commit 06ca44d53d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/ultima/ultima4/controllers/intro_controller.cpp
View File

@ -665,7 +665,7 @@ void IntroController::initiateNewGame() {
g_screen->update();
Common::String nameBuffer = ReadStringController::get(12, &_menuArea);
if (nameBuffer.empty()) {
if (nameBuffer.empty() || shouldQuit()) {
// the user didn't enter a name
_menuArea.disableCursor();
g_screen->screenEnableCursor();
@ -687,12 +687,15 @@ void IntroController::initiateNewGame() {
SexType sex;
int sexChoice = ReadChoiceController::get("mf");
if (sexChoice == 'm')
sex = SEX_MALE;
else
sex = SEX_FEMALE;
finishInitiateGame(nameBuffer, sex);
if (!shouldQuit()) {
if (sexChoice == 'm')
sex = SEX_MALE;
else
sex = SEX_FEMALE;
finishInitiateGame(nameBuffer, sex);
}
}
void IntroController::finishInitiateGame(const Common::String &nameBuffer, SexType sex) {