[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.68,1.69 dialogs.h,1.21,1.22

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7961/scumm

Modified Files:
	dialogs.cpp dialogs.h 
Log Message:

Change Amiga palette option to Amiga version


Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- dialogs.cpp	18 Aug 2003 10:56:21 -0000	1.68
+++ dialogs.cpp	20 Aug 2003 14:01:39 -0000	1.69
@@ -71,7 +71,7 @@
 	"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 @@
 	// 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 @@
 
 	// 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 @@
 		_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();

Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- dialogs.h	28 Jul 2003 01:36:16 -0000	1.21
+++ dialogs.h	20 Aug 2003 14:01:39 -0000	1.22
@@ -133,7 +133,7 @@
 	StaticTextWidget *_sfxVolumeLabel;
 	
 	CheckboxWidget *subtitlesCheckbox;
-	CheckboxWidget *amigaPalCheckbox;
+	CheckboxWidget *amigaCheckbox;
 };
 
 class InfoDialog : public ScummDialog {