rename Queen::GameSettings to Queen::GameConfig

svn-id: r11031

4 files changed, 21 insertions, 26 deletions

diff --git a/queen/graphics.cpp b/queen/graphics.cpp
index 52bba6e25c..1062695239 100644
--- a/queen/graphics.cpp
+++ b/queen/graphics.cpp
@@ -758,7 +758,7 @@ void Graphics::loadPanel() {
 }
 
 
-void Graphics::useJournal(GameSettings *settings) {
+void Graphics::useJournal(GameConfig *cfg) {
 
 	bobClearAll();
 	loadBackdrop("journal.pcx", 160);
@@ -780,7 +780,7 @@ void Graphics::useJournal(GameSettings *settings) {
 
 	// XXX setup zones
 
-	journalBobPreDraw(settings);
+	journalBobPreDraw(cfg);
 	_display->palFadeIn(0, 255, 160);
 
 	// XXX l.1191-1509
@@ -798,22 +798,22 @@ void Graphics::journalBobSetup(uint32 bobnum, uint16 x, uint16 y, uint16 frameNu
 }
 
 
-void Graphics::journalBobPreDraw(GameSettings *settings) {
+void Graphics::journalBobPreDraw(GameConfig *cfg) {
 
 	journalBobSetup(1, 32, 8, 1); // Review entry
 	journalBobSetup(2, 32, 56, 2); // Make entry
 	journalBobSetup(3, 32, 104, 1); // Close book
 	journalBobSetup(4, 32, 152, 3); // Give up
-	journalBobSetup(5, 136 + settings->talkSpeed * 4 - 4, 164, 18); // Text speed
+	journalBobSetup(5, 136 + cfg->talkSpeed * 4 - 4, 164, 18); // Text speed
 	journalBobSetup(6, 221, 155, 16); // SFX on/off
-	_bobs[6].active = settings->sfxToggle;
-	journalBobSetup(7, 136 + settings->musicVolume * 130 / 100 - 4, 177, 19); // Music volume
+	_bobs[6].active = cfg->sfxToggle;
+	journalBobSetup(7, 136 + cfg->musicVolume * 130 / 100 - 4, 177, 19); // Music volume
 	journalBobSetup(10, 158, 155, 16); // Voice on/off
-	_bobs[10].active = settings->speechToggle;
+	_bobs[10].active = cfg->speechToggle;
 	journalBobSetup(11, 125, 167, 16); // Text on/off
-	_bobs[11].active = settings->textToggle;
+	_bobs[11].active = cfg->textToggle;
 	journalBobSetup(12, 125, 181, 16); // Music on/off
-	_bobs[12].active = settings->musicToggle;
+	_bobs[12].active = cfg->musicToggle;
 }
 
 
diff --git a/queen/graphics.h b/queen/graphics.h
index 6db13c1c18..e57880e35e 100644
--- a/queen/graphics.h
+++ b/queen/graphics.h
@@ -158,9 +158,9 @@ public:
 	void loadBackdrop(const char *name, uint16 room);
 	void loadPanel();
 
-	void useJournal(GameSettings *settings);
+	void useJournal(GameConfig *cfg);
 	void journalBobSetup(uint32 bobnum, uint16 x, uint16 y, uint16 frame);
-	void journalBobPreDraw(GameSettings *settings);
+	void journalBobPreDraw(GameConfig *cfg);
 
 	void cameraBob(int bobNum) { _cameraBob = bobNum; }
 	int cameraBob() const { return _cameraBob; }
diff --git a/queen/logic.h b/queen/logic.h
index 19e1c4cef4..6d94edff1d 100644
--- a/queen/logic.h
+++ b/queen/logic.h
@@ -41,7 +41,7 @@ struct ZoneSlot {
 	Box box;
 };
 
-struct GameSettings {
+struct GameConfig {
 	int musicVolume;
 	bool musicToggle;
 	bool sfxToggle;
@@ -393,7 +393,7 @@ protected:
 	//! Describe a string based animation (30 frames maximum, bob number must be < 17)
 	AnimFrame _newAnim[17][30];
 
-	GameSettings _settings;
+	GameConfig _settings;
 
 	//! Inventory items
 	int16 _inventoryItem[4];
diff --git a/queen/xref.txt b/queen/xref.txt
index b0b95924d3..b5a89406bb 100644
--- a/queen/xref.txt
+++ b/queen/xref.txt
@@ -103,14 +103,17 @@ AREAVAR						(boolean, if true display objects/areas boxes)
 
 GAME SETTINGS
 =============
+game_load()
+game_save()
 -
 config_request
-MUSICTOGGLE					GameSettings::musicToggle
-SFXTOGGLE					GameSettings::sfxToggle
-TALKSPD						GameSettings::talkSpeed
-TEXTTOGGLE					GameSettings::textToggle
+MUSICTOGGLE					GameConfig::musicToggle
+SFXTOGGLE					GameConfig::sfxToggle
+TALKSPD						GameConfig::talkSpeed
+TEXTTOGGLE					GameConfig::textToggle
 VersionStr					Logic::language (add more functions if needed)
-VOICETOGGLE					GameSettings::speechToggle
+VOICETOGGLE					GameConfig::speechToggle
+walkgameload
 
 
 GRAPHICS
@@ -289,14 +292,6 @@ topen()						Resource::loadFile
 tseek() 					*not needed*
 
 
-SAVE/LOAD SYSTEM
-================
-game_load()
-game_save()
--
-walkgameload
-
-
 SCREEN
 ======
 changejoepal()				Display::palSetJoe