mirror of
https://github.com/libretro/scummvm.git
synced 2025-04-02 23:01:42 +00:00
NANCY: Remove custom engine settings dialog
Replaced nancy's custom settings dialog with metaengine's extra GUI options feature.
This commit is contained in:
Kaloyan Chehlarski
parent
4f10a4c08e
commit
e5aa308769
@ -1,2 +1,2 @@
|
||||
engines/nancy/input.cpp
|
||||
engines/nancy/dialogs.cpp
|
||||
engines/nancy/metaengine.cpp
|
||||
|
||||
@ -227,7 +227,7 @@ public:
|
||||
NancyMetaEngineDetection() : AdvancedMetaEngineDetection(gameDescriptions, sizeof(Nancy::NancyGameDescription), nancyGames) {
|
||||
_maxScanDepth = 2;
|
||||
_directoryGlobs = directoryGlobs;
|
||||
_guiOptions = GUIO2(GUIO_NOMIDI, GUIO_NOASPECT);
|
||||
_guiOptions = GUIO4(GUIO_NOMIDI, GUIO_NOASPECT, GUIO_GAMEOPTIONS1, GUIO_GAMEOPTIONS2);
|
||||
}
|
||||
|
||||
const char *getName() const override {
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
/* ScummVM - Graphic Adventure Engine
|
||||
*
|
||||
* ScummVM is the legal property of its developers, whose names
|
||||
* are too numerous to list here. Please refer to the COPYRIGHT
|
||||
* file distributed with this source distribution.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/formats/winexe.h"
|
||||
#include "common/translation.h"
|
||||
#include "common/stream.h"
|
||||
|
||||
#include "gui/widgets/tab.h"
|
||||
#include "gui/widgets/edittext.h"
|
||||
|
||||
#include "gui/ThemeEval.h"
|
||||
|
||||
#include "engines/nancy/dialogs.h"
|
||||
#include "engines/nancy/iff.h"
|
||||
|
||||
#include "engines/nancy/state/scene.h"
|
||||
|
||||
namespace Nancy {
|
||||
|
||||
NancyOptionsWidget::NancyOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
|
||||
OptionsContainerWidget(boss, name, "NancyOptionsDialog", false, domain) {
|
||||
_playerSpeechCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "NancyOptionsDialog.PlayerSpeech", _("Player Speech"), _("Enable player speech. Only works if speech is enabled in the Audio settings."));
|
||||
_characterSpeechCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "NancyOptionsDialog.CharacterSpeech", _("Character Speech"), _("Enable NPC speech. Only works if speech is enabled in the Audio settings."));
|
||||
|
||||
new GUI::StaticTextWidget(widgetsBoss(), "NancyOptionsDialog.SpeechSettingsLabel", _("Speech Options"));
|
||||
}
|
||||
|
||||
void NancyOptionsWidget::load() {
|
||||
_playerSpeechCheckbox->setState(ConfMan.getBool("player_speech", _domain));
|
||||
_characterSpeechCheckbox->setState(ConfMan.getBool("character_speech", _domain));
|
||||
}
|
||||
|
||||
bool NancyOptionsWidget::save() {
|
||||
ConfMan.setBool("player_speech", _playerSpeechCheckbox->getState(), _domain);
|
||||
ConfMan.setBool("character_speech", _characterSpeechCheckbox->getState(), _domain);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void NancyOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const {
|
||||
layouts.addDialog(layoutName, overlayedLayout)
|
||||
.addLayout(GUI::ThemeLayout::kLayoutVertical)
|
||||
.addPadding(16, 16, 16, 16)
|
||||
.addWidget("SpeechSettingsLabel", "OptionsLabel")
|
||||
.addWidget("PlayerSpeech", "Checkbox")
|
||||
.addWidget("CharacterSpeech", "Checkbox")
|
||||
.closeLayout()
|
||||
.closeDialog();
|
||||
}
|
||||
|
||||
bool NancyOptionsWidget::isInGame() const {
|
||||
return _domain.equals(ConfMan.getActiveDomainName());
|
||||
}
|
||||
|
||||
} // End of namespace Nancy
|
||||
@ -1,48 +0,0 @@
|
||||
/* ScummVM - Graphic Adventure Engine
|
||||
*
|
||||
* ScummVM is the legal property of its developers, whose names
|
||||
* are too numerous to list here. Please refer to the COPYRIGHT
|
||||
* file distributed with this source distribution.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "engines/dialogs.h"
|
||||
|
||||
#ifndef NANCY_DIALOGS_H
|
||||
#define NANCY_DIALOGS_H
|
||||
|
||||
namespace Nancy {
|
||||
|
||||
class NancyOptionsWidget : public GUI::OptionsContainerWidget {
|
||||
public:
|
||||
NancyOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain);
|
||||
~NancyOptionsWidget() override {};
|
||||
|
||||
void load() override;
|
||||
bool save() override;
|
||||
|
||||
private:
|
||||
void defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const override;
|
||||
|
||||
bool isInGame() const;
|
||||
|
||||
GUI::CheckboxWidget *_playerSpeechCheckbox;
|
||||
GUI::CheckboxWidget *_characterSpeechCheckbox;
|
||||
};
|
||||
|
||||
} // End of namespace Nancy
|
||||
|
||||
#endif // NANCY_DIALOGS_H
|
||||
@ -24,7 +24,35 @@
|
||||
#include "engines/nancy/nancy.h"
|
||||
#include "engines/nancy/graphics.h"
|
||||
#include "engines/nancy/input.h"
|
||||
#include "engines/nancy/dialogs.h"
|
||||
|
||||
#include "common/translation.h"
|
||||
#include "common/config-manager.h"
|
||||
|
||||
static const ADExtraGuiOptionsMap optionsList[] = {
|
||||
{
|
||||
GUIO_GAMEOPTIONS1,
|
||||
{
|
||||
_s("Player Speech"),
|
||||
_s("Enable player speech. Only works if speech is enabled in the Audio settings."),
|
||||
"player_speech",
|
||||
true,
|
||||
0,
|
||||
0
|
||||
}
|
||||
},
|
||||
{
|
||||
GUIO_GAMEOPTIONS2,
|
||||
{
|
||||
_s("Character Speech"),
|
||||
_s("Enable NPC speech. Only works if speech is enabled in the Audio settings."),
|
||||
"character_speech",
|
||||
true,
|
||||
0,
|
||||
0
|
||||
}
|
||||
},
|
||||
AD_EXTRA_GUI_OPTIONS_TERMINATOR
|
||||
};
|
||||
|
||||
class NancyMetaEngine : public AdvancedMetaEngine {
|
||||
public:
|
||||
@ -42,7 +70,8 @@ public:
|
||||
void getSavegameThumbnail(Graphics::Surface &thumb) override;
|
||||
|
||||
void registerDefaultSettings(const Common::String &target) const override;
|
||||
GUI::OptionsContainerWidget *buildEngineOptionsWidget(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const override;
|
||||
|
||||
const ADExtraGuiOptionsMap *getAdvancedExtraGuiOptions() const override;
|
||||
};
|
||||
|
||||
Common::KeymapArray NancyMetaEngine::initKeymaps(const char *target) const {
|
||||
@ -88,8 +117,8 @@ void NancyMetaEngine::registerDefaultSettings(const Common::String &target) cons
|
||||
ConfMan.setBool("character_speech", true, target);
|
||||
}
|
||||
|
||||
GUI::OptionsContainerWidget *NancyMetaEngine::buildEngineOptionsWidget(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const {
|
||||
return new Nancy::NancyOptionsWidget(boss, name, target);
|
||||
const ADExtraGuiOptionsMap *NancyMetaEngine::getAdvancedExtraGuiOptions() const {
|
||||
return optionsList;
|
||||
}
|
||||
|
||||
#if PLUGIN_ENABLED_DYNAMIC(NANCY)
|
||||
|
||||
@ -35,7 +35,6 @@ MODULE_OBJS = \
|
||||
console.o \
|
||||
cursor.o \
|
||||
decompress.o \
|
||||
dialogs.o \
|
||||
enginedata.o \
|
||||
font.o \
|
||||
graphics.o \
|
||||
|
||||
@ -33,7 +33,6 @@
|
||||
#include "engines/nancy/input.h"
|
||||
#include "engines/nancy/sound.h"
|
||||
#include "engines/nancy/graphics.h"
|
||||
#include "engines/nancy/dialogs.h"
|
||||
#include "engines/nancy/console.h"
|
||||
#include "engines/nancy/util.h"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user