[Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.50,1.51 graphics.h,1.33,1.34 graphics.cpp,1.38,1.39 xref.txt,1.26,1.27

Gregory Montoir cyx at users.sourceforge.net
Sat Nov 1 12:47:03 CET 2003


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv22102

Modified Files:
	logic.h graphics.h graphics.cpp xref.txt 
Log Message:
rename Queen::GameSettings to Queen::GameConfig

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- logic.h	31 Oct 2003 13:47:27 -0000	1.50
+++ logic.h	1 Nov 2003 20:45:45 -0000	1.51
@@ -41,7 +41,7 @@
 	Box box;
 };
 
-struct GameSettings {
+struct GameConfig {
 	int musicVolume;
 	bool musicToggle;
 	bool sfxToggle;
@@ -393,7 +393,7 @@
 	//! 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];

Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- graphics.h	25 Oct 2003 09:12:18 -0000	1.33
+++ graphics.h	1 Nov 2003 20:45:45 -0000	1.34
@@ -158,9 +158,9 @@
 	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; }

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- graphics.cpp	31 Oct 2003 10:11:27 -0000	1.38
+++ graphics.cpp	1 Nov 2003 20:45:45 -0000	1.39
@@ -758,7 +758,7 @@
 }
 
 
-void Graphics::useJournal(GameSettings *settings) {
+void Graphics::useJournal(GameConfig *cfg) {
 
 	bobClearAll();
 	loadBackdrop("journal.pcx", 160);
@@ -780,7 +780,7 @@
 
 	// XXX setup zones
 
-	journalBobPreDraw(settings);
+	journalBobPreDraw(cfg);
 	_display->palFadeIn(0, 255, 160);
 
 	// XXX l.1191-1509
@@ -798,22 +798,22 @@
 }
 
 
-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;
 }
 
 

Index: xref.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/xref.txt,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- xref.txt	31 Oct 2003 13:47:28 -0000	1.26
+++ xref.txt	1 Nov 2003 20:45:45 -0000	1.27
@@ -103,14 +103,17 @@
 
 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
@@ -287,14 +290,6 @@
 tflen() 					Resource::fileSize
 topen()						Resource::loadFile
 tseek() 					*not needed*
-
-
-SAVE/LOAD SYSTEM
-================
-game_load()
-game_save()
--
-walkgameload
 
 
 SCREEN





More information about the Scummvm-git-logs mailing list