[Scummvm-cvs-logs] SF.net SVN: scummvm:[45668] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 45668
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45668&view=rev
Author:   thebluegr
Date:     2009-11-04 15:32:25 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
Removed unused variables and placed some more old code inside INCLUDE_OLDGFX defines

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.cpp
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/engine/state.cpp
    scummvm/trunk/engines/sci/engine/state.h
    scummvm/trunk/engines/sci/gui32/gui32.cpp

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2009-11-04 14:27:03 UTC (rev 45667)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2009-11-04 15:32:25 UTC (rev 45668)
@@ -277,20 +277,17 @@
 	return _reset_graphics_input(s);
 }
 
-#endif
-
 static void _free_graphics_input(EngineState *s) {
 	debug(2, "Freeing graphics");
 
-#ifdef INCLUDE_OLDGFX
 	delete s->visual;
 
 	s->wm_port = s->titlebar_port = s->picture_port = NULL;
 	s->visual = NULL;
 	s->dyn_views = NULL;
 	s->port = NULL;
-#endif
 }
+#endif
 
 int game_init_sound(EngineState *s, int sound_flags) {
 	if (getSciVersion() > SCI_VERSION_0_LATE)
@@ -391,7 +388,6 @@
 #endif
 
 	s->successor = NULL; // No successor
-	s->_statusBarText.clear(); // Status bar is blank
 
 	SystemString *str = &s->sys_strings->_strings[SYS_STRING_PARSER_BASE];
 	str->_name = "parser-base";
@@ -445,7 +441,9 @@
 
 	delete s->_menubar;
 
+#ifdef INCLUDE_OLDGFX
 	_free_graphics_input(s);
+#endif
 
 	// Close all opened file handles
 	s->_fileHandles.clear();

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-11-04 14:27:03 UTC (rev 45667)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-11-04 15:32:25 UTC (rev 45668)
@@ -738,8 +738,6 @@
 
 	// Copy some old data
 	retval->gfx_state = s->gfx_state;
-	retval->sound_mute = s->sound_mute;
-	retval->sound_volume = s->sound_volume;
 
 	retval->saveLoadWithSerializer(ser);	// FIXME: Error handling?
 

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2009-11-04 14:27:03 UTC (rev 45667)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2009-11-04 15:32:25 UTC (rev 45668)
@@ -38,8 +38,6 @@
 	gfx_state = 0;
 
 	sfx_init_flags = 0;
-	sound_volume = 0;
-	sound_mute = 0;
 
 	restarting_flags = 0;
 

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2009-11-04 14:27:03 UTC (rev 45667)
+++ scummvm/trunk/engines/sci/engine/state.h	2009-11-04 15:32:25 UTC (rev 45668)
@@ -138,14 +138,9 @@
 	AudioPlayer *_audio;
 	SfxState _sound; /**< sound subsystem */
 	int sfx_init_flags; /**< flags the sfx subsystem was initialised with */
-	unsigned int sound_volume; /**< 0x0 -> 0xf Current volume of sound system */
-	unsigned int sound_mute; /**< 0 = not, else == saved value */
 
 	byte restarting_flags; /**< Flags used for restarting */
 
-	/** Text on the status bar, or NULL if the title bar is blank */
-	Common::String _statusBarText;
-
 #ifdef INCLUDE_OLDGFX
 	int *pic_priority_table; /**< 16 entries with priorities or NULL if not present */
 	byte pic_not_valid; /**< Is 0 if the background picture is "valid" */

Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-11-04 14:27:03 UTC (rev 45667)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-11-04 15:32:25 UTC (rev 45668)
@@ -822,10 +822,8 @@
 	_s->titlebar_port->_bgcolor.visual = get_pic_color(_s, colorBack);
 	_s->titlebar_port->_bgcolor.mask = GFX_MASK_VISUAL;
 
-	_s->_statusBarText = text;
+	sciw_set_status_bar(_s, _s->titlebar_port, text, colorPen, colorBack);
 
-	sciw_set_status_bar(_s, _s->titlebar_port, _s->_statusBarText, colorPen, colorBack);
-
 	gfxop_update(_s->gfx_state);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.