diff options
author | Travis Howell | 2003-08-20 14:01:39 +0000 |
---|---|---|
committer | Travis Howell | 2003-08-20 14:01:39 +0000 |
commit | be0d723e7f421a11b718d0526caf38be96ac7870 (patch) | |
tree | c3360120ff7ef2281ec5126b282b5bee977073ee | |
parent | af17c1ac5161b261c4c8c41e360dd5d11b7859d7 (diff) | |
download | scummvm-rg350-be0d723e7f421a11b718d0526caf38be96ac7870.tar.gz scummvm-rg350-be0d723e7f421a11b718d0526caf38be96ac7870.tar.bz2 scummvm-rg350-be0d723e7f421a11b718d0526caf38be96ac7870.zip |
Change Amiga palette option to Amiga version
svn-id: r9800
-rw-r--r-- | backends/PalmOS/Src/palmstart.cpp | 2 | ||||
-rw-r--r-- | gui/launcher.cpp | 12 | ||||
-rw-r--r-- | scumm/dialogs.cpp | 12 | ||||
-rw-r--r-- | scumm/dialogs.h | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/backends/PalmOS/Src/palmstart.cpp b/backends/PalmOS/Src/palmstart.cpp index 538db608b0..8d3a021d88 100644 --- a/backends/PalmOS/Src/palmstart.cpp +++ b/backends/PalmOS/Src/palmstart.cpp @@ -2658,7 +2658,7 @@ static void StartScummVM() { StrIToA(num, gameInfoP->roomNum); AddArg(&argvP[argc], "-b", num, &argc); } - // amiga palette + // amiga version if (gameInfoP->amiga) { AddArg(&argvP[argc], "-a", NULL, &argc); } diff --git a/gui/launcher.cpp b/gui/launcher.cpp index eb151c6df2..2246ae7ed9 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -82,7 +82,7 @@ protected: EditTextWidget *_descriptionWidget; EditTextWidget *_domainWidget; CheckboxWidget *_fullscreenCheckbox; - CheckboxWidget *_amigaPalCheckbox; + CheckboxWidget *_amigaCheckbox; }; EditGameDialog::EditGameDialog(NewGui *gui, Config &config, const String &domain) @@ -127,10 +127,10 @@ EditGameDialog::EditGameDialog(NewGui *gui, Config &config, const String &domain // Display 'Amiga' checkbox, but only for Scumm games. if (GID_SCUMM_FIRST <= v->id && v->id <= GID_SCUMM_LAST) { - _amigaPalCheckbox = new CheckboxWidget(this, 15, 82, 200, 16, "Use Amiga Palette", 0, 'A'); - _amigaPalCheckbox->setState(_config.getBool("amiga", false, _domain)); + _amigaCheckbox = new CheckboxWidget(this, 15, 82, 200, 16, "Amiga Version", 0, 'A'); + _amigaCheckbox->setState(_config.getBool("amiga", false, _domain)); } else { - _amigaPalCheckbox = 0; + _amigaCheckbox = 0; } // Add OK & Cancel buttons @@ -151,8 +151,8 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat _config.rename_domain(_domain, newDomain); } _config.set("description", _descriptionWidget->getLabel(), newDomain); - if (_amigaPalCheckbox) - _config.setBool("amiga", _amigaPalCheckbox->getState(), newDomain); + if (_amigaCheckbox) + _config.setBool("amiga", _amigaCheckbox->getState(), newDomain); _config.setBool("fullscreen", _fullscreenCheckbox->getState(), newDomain); setResult(1); close(); diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index ebc90249b8..421482f2a6 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -71,7 +71,7 @@ static const char* string_map_table_custom[] = { "Options", //17 "Misc", //18 "Show speech subtitles", //19 - "Amiga palette conversion", //20 + "Amiga version", //20 "If you can read this,", //21 SPARE "you don't need glasses", //22 SPARE "Close", //23 @@ -469,7 +469,7 @@ OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm) // Some misc options // subtitlesCheckbox = new CheckboxWidget(this, 15, 62, 200, 16, "Show subtitles", 0, 'S'); - amigaPalCheckbox = new CheckboxWidget(this, 15, 80, 200, 16, "Amiga palette conversion", 0, 'P'); + amigaCheckbox = new CheckboxWidget(this, 15, 80, 200, 16, "Amiga version", 0, 'P'); // // Create the sub dialog(s) @@ -503,7 +503,7 @@ void OptionsDialog::open() { // update checkboxes, too subtitlesCheckbox->setState(_scumm->_noSubtitles == false); - amigaPalCheckbox->setState((_scumm->_features & GF_AMIGA) != 0); + amigaCheckbox->setState((_scumm->_features & GF_AMIGA) != 0); } void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { @@ -553,13 +553,13 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data _scumm->_noSubtitles = !subtitlesCheckbox->getState(); g_config->setBool("nosubtitles", _scumm->_noSubtitles); - // Amiga palette? - if (amigaPalCheckbox->getState()) + // Amiga version? + if (amigaCheckbox->getState()) _scumm->setFeatures (_scumm->_features | GF_AMIGA); else _scumm->setFeatures (_scumm->_features & (~GF_AMIGA)); - g_config->setBool("amiga", amigaPalCheckbox->getState()); + g_config->setBool("amiga", amigaCheckbox->getState()); // Finally flush the modified config g_config->flush(); diff --git a/scumm/dialogs.h b/scumm/dialogs.h index e9ae03d38a..d0abd0c404 100644 --- a/scumm/dialogs.h +++ b/scumm/dialogs.h @@ -133,7 +133,7 @@ protected: StaticTextWidget *_sfxVolumeLabel; CheckboxWidget *subtitlesCheckbox; - CheckboxWidget *amigaPalCheckbox; + CheckboxWidget *amigaCheckbox; }; class InfoDialog : public ScummDialog { |