forked from teamnwah/openmw-tes3coop
Merge branch 'openmw-36'
This commit is contained in:
commit
913caf96bd
4 changed files with 18 additions and 8 deletions
|
@ -28,6 +28,7 @@
|
|||
Bug #2521: NPCs don't react to stealing when inventory menu is open.
|
||||
Bug #2525: Can't click on red dialogue choice [rise of house telvanni][60fffec]
|
||||
Bug #2530: GetSpellEffects not working as in vanilla
|
||||
Bug #2557: Crash on first launch after choosing "Run installation wizard"
|
||||
Feature #139: Editor: Global Search & Replace
|
||||
Feature #1219: Editor: Add dialogue mode only columns
|
||||
Feature #2024: Hotkey for hand to hand (i.e. unequip any weapon)
|
||||
|
|
|
@ -59,14 +59,16 @@ int main(int argc, char *argv[])
|
|||
|
||||
Launcher::MainDialog mainWin;
|
||||
|
||||
if (!mainWin.showFirstRunDialog())
|
||||
Launcher::FirstRunDialogResult result = mainWin.showFirstRunDialog();
|
||||
if (result == Launcher::FirstRunDialogResultFailure)
|
||||
return 0;
|
||||
|
||||
// if (!mainWin.setup()) {
|
||||
// return 0;
|
||||
// }
|
||||
|
||||
mainWin.show();
|
||||
if (result == Launcher::FirstRunDialogResultContinue)
|
||||
mainWin.show();
|
||||
|
||||
int returnValue = app.exec();
|
||||
SDL_Quit();
|
||||
|
|
|
@ -148,10 +148,10 @@ void Launcher::MainDialog::createPages()
|
|||
|
||||
}
|
||||
|
||||
bool Launcher::MainDialog::showFirstRunDialog()
|
||||
Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
|
||||
{
|
||||
if (!setupLauncherSettings())
|
||||
return false;
|
||||
return FirstRunDialogResultFailure;
|
||||
|
||||
if (mLauncherSettings.value(QString("General/firstrun"), QString("true")) == QLatin1String("true"))
|
||||
{
|
||||
|
@ -176,14 +176,14 @@ bool Launcher::MainDialog::showFirstRunDialog()
|
|||
if (msgBox.clickedButton() == wizardButton)
|
||||
{
|
||||
if (!mWizardInvoker->startProcess(QLatin1String("openmw-wizard"), false)) {
|
||||
return false;
|
||||
return FirstRunDialogResultFailure;
|
||||
} else {
|
||||
return true;
|
||||
return FirstRunDialogResultWizard;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return setup();
|
||||
return setup() ? FirstRunDialogResultContinue : FirstRunDialogResultFailure;
|
||||
}
|
||||
|
||||
bool Launcher::MainDialog::setup()
|
||||
|
|
|
@ -31,6 +31,13 @@ namespace Launcher
|
|||
class UnshieldThread;
|
||||
class SettingsPage;
|
||||
|
||||
enum FirstRunDialogResult
|
||||
{
|
||||
FirstRunDialogResultFailure,
|
||||
FirstRunDialogResultContinue,
|
||||
FirstRunDialogResultWizard
|
||||
};
|
||||
|
||||
#ifndef WIN32
|
||||
bool expansions(Launcher::UnshieldThread& cd);
|
||||
#endif
|
||||
|
@ -44,7 +51,7 @@ namespace Launcher
|
|||
~MainDialog();
|
||||
|
||||
bool setup();
|
||||
bool showFirstRunDialog();
|
||||
FirstRunDialogResult showFirstRunDialog();
|
||||
|
||||
bool reloadSettings();
|
||||
bool writeSettings();
|
||||
|
|
Loading…
Reference in a new issue