thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change Amiga palette option to Amiga version

Browse source 
svn-id: r9800
This commit is contained in:
Travis Howell 2003-08-20 14:01:39 +00:00
parent af17c1ac51
commit be0d723e7f
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/PalmOS/Src/palmstart.cpp
View file

@ -2658,7 +2658,7 @@ static void StartScummVM() {
StrIToA(num, gameInfoP->roomNum); StrIToA(num, gameInfoP->roomNum);
AddArg(&argvP[argc], "-b", num, &argc); AddArg(&argvP[argc], "-b", num, &argc);
} }
// amiga palette // amiga version
if (gameInfoP->amiga) { if (gameInfoP->amiga) {
AddArg(&argvP[argc], "-a", NULL, &argc); AddArg(&argvP[argc], "-a", NULL, &argc);
} }

12
gui/launcher.cpp
View file

@ -82,7 +82,7 @@ protected:
EditTextWidget *_descriptionWidget; EditTextWidget *_descriptionWidget;
EditTextWidget *_domainWidget; EditTextWidget *_domainWidget;
CheckboxWidget *_fullscreenCheckbox; CheckboxWidget *_fullscreenCheckbox;
CheckboxWidget *_amigaPalCheckbox; CheckboxWidget *_amigaCheckbox;
}; };
EditGameDialog::EditGameDialog(NewGui *gui, Config &config, const String &domain) 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. // Display 'Amiga' checkbox, but only for Scumm games.
if (GID_SCUMM_FIRST <= v->id && v->id <= GID_SCUMM_LAST) { if (GID_SCUMM_FIRST <= v->id && v->id <= GID_SCUMM_LAST) {
_amigaPalCheckbox = new CheckboxWidget(this, 15, 82, 200, 16, "Use Amiga Palette", 0, 'A'); _amigaCheckbox = new CheckboxWidget(this, 15, 82, 200, 16, "Amiga Version", 0, 'A');
_amigaPalCheckbox->setState(_config.getBool("amiga", false, _domain)); _amigaCheckbox->setState(_config.getBool("amiga", false, _domain));
} else { } else {
_amigaPalCheckbox = 0; _amigaCheckbox = 0;
} }
// Add OK & Cancel buttons // Add OK & Cancel buttons
@ -151,8 +151,8 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
_config.rename_domain(_domain, newDomain); _config.rename_domain(_domain, newDomain);
} }
_config.set("description", _descriptionWidget->getLabel(), newDomain); _config.set("description", _descriptionWidget->getLabel(), newDomain);
if (_amigaPalCheckbox) if (_amigaCheckbox)
_config.setBool("amiga", _amigaPalCheckbox->getState(), newDomain); _config.setBool("amiga", _amigaCheckbox->getState(), newDomain);
_config.setBool("fullscreen", _fullscreenCheckbox->getState(), newDomain); _config.setBool("fullscreen", _fullscreenCheckbox->getState(), newDomain);
setResult(1); setResult(1);
close(); close();

12
scumm/dialogs.cpp
View file

@ -71,7 +71,7 @@ static const char* string_map_table_custom[] = {
"Options", //17 "Options", //17
"Misc", //18 "Misc", //18
"Show speech subtitles", //19 "Show speech subtitles", //19
"Amiga palette conversion", //20 "Amiga version", //20
"If you can read this,", //21 SPARE "If you can read this,", //21 SPARE
"you don't need glasses", //22 SPARE "you don't need glasses", //22 SPARE
"Close", //23 "Close", //23
@ -469,7 +469,7 @@ OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm)
// Some misc options // Some misc options
// //
subtitlesCheckbox = new CheckboxWidget(this, 15, 62, 200, 16, "Show subtitles", 0, 'S'); 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) // Create the sub dialog(s)
@ -503,7 +503,7 @@ void OptionsDialog::open() {
// update checkboxes, too // update checkboxes, too
subtitlesCheckbox->setState(_scumm->_noSubtitles == false); 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) { 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(); _scumm->_noSubtitles = !subtitlesCheckbox->getState();
g_config->setBool("nosubtitles", _scumm->_noSubtitles); g_config->setBool("nosubtitles", _scumm->_noSubtitles);
// Amiga palette? // Amiga version?
if (amigaPalCheckbox->getState()) if (amigaCheckbox->getState())
_scumm->setFeatures (_scumm->_features | GF_AMIGA); _scumm->setFeatures (_scumm->_features | GF_AMIGA);
else else
_scumm->setFeatures (_scumm->_features & (~GF_AMIGA)); _scumm->setFeatures (_scumm->_features & (~GF_AMIGA));
g_config->setBool("amiga", amigaPalCheckbox->getState()); g_config->setBool("amiga", amigaCheckbox->getState());
// Finally flush the modified config // Finally flush the modified config
g_config->flush(); g_config->flush();

2
scumm/dialogs.h
View file

@ -133,7 +133,7 @@ protected:
StaticTextWidget *_sfxVolumeLabel; StaticTextWidget *_sfxVolumeLabel;
CheckboxWidget *subtitlesCheckbox; CheckboxWidget *subtitlesCheckbox;
CheckboxWidget *amigaPalCheckbox; CheckboxWidget *amigaCheckbox;
}; };
class InfoDialog : public ScummDialog { class InfoDialog : public ScummDialog {