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

[thebluegr at users.sourceforge.net]

Revision: 44857
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44857&view=rev
Author:   thebluegr
Date:     2009-10-09 23:53:37 +0000 (Fri, 09 Oct 2009)

Log Message:
-----------
Removed the unused _flags variable from EngineState

Modified Paths:
--------------
    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/sci.cpp

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-10-09 23:19:53 UTC (rev 44856)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-10-09 23:53:37 UTC (rev 44857)
@@ -717,7 +717,7 @@
 	}
 
 	// FIXME: Do in-place loading at some point, instead of creating a new EngineState instance from scratch.
-	retval = new EngineState(s->resMan, s->_kernel, s->_voc, s->_gui, s->_cursor, s->_flags);
+	retval = new EngineState(s->resMan, s->_kernel, s->_voc, s->_gui, s->_cursor);
 
 	// Copy some old data
 	retval->gfx_state = s->gfx_state;

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2009-10-09 23:19:53 UTC (rev 44856)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2009-10-09 23:53:37 UTC (rev 44857)
@@ -29,8 +29,8 @@
 
 namespace Sci {
 
-EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor, uint32 flags)
-: resMan(res), _kernel(kernel), _voc(voc), _gui(gui), _cursor(cursor), _flags(flags), _dirseeker(this) {
+EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor)
+: resMan(res), _kernel(kernel), _voc(voc), _gui(gui), _cursor(cursor), _dirseeker(this) {
 
 	gfx_state = 0;
 	old_screen = 0;

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2009-10-09 23:19:53 UTC (rev 44856)
+++ scummvm/trunk/engines/sci/engine/state.h	2009-10-09 23:53:37 UTC (rev 44857)
@@ -160,7 +160,7 @@
 
 struct EngineState : public Common::Serializable {
 public:
-	EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor, uint32 flags);
+	EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor);
 	virtual ~EngineState();
 
 	virtual void saveLoadWithSerializer(Common::Serializer &ser);
@@ -171,8 +171,6 @@
 	Kernel *_kernel;
 	Vocabulary *_voc;
 
-	const uint32 _flags;			/**< Specific game flags */
-
 	Common::String _gameName; /**< Designation of the primary object (which inherits from Game) */
 
 	/* Non-VM information */

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2009-10-09 23:19:53 UTC (rev 44856)
+++ scummvm/trunk/engines/sci/sci.cpp	2009-10-09 23:53:37 UTC (rev 44857)
@@ -126,8 +126,6 @@
 
 	// FIXME/TODO: Move some of the stuff below to init()
 
-	const uint32 flags = getFlags();
-
 	_resMan = new ResourceManager();
 
 	if (!_resMan) {
@@ -142,7 +140,7 @@
 	SciGuiCursor *cursor = new SciGuiCursor(_resMan, palette);
 
 	// We'll set the GUI below
-	_gamestate = new EngineState(_resMan, _kernel, _vocabulary, NULL, cursor, flags);
+	_gamestate = new EngineState(_resMan, _kernel, _vocabulary, NULL, cursor);
 
 	// Gui change
 	//_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor);    // new


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