thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed the unused _flags variable from EngineState

Browse source 
svn-id: r44857
This commit is contained in:
Filippos Karapetis 2009-10-09 23:53:37 +00:00
parent b91ae69ad2
commit 9bb73a8457
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/engine/savegame.cpp
View file

@ -717,7 +717,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
} }
// FIXME: Do in-place loading at some point, instead of creating a new EngineState instance from scratch. // 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 // Copy some old data
retval->gfx_state = s->gfx_state; retval->gfx_state = s->gfx_state;

4
engines/sci/engine/state.cpp
View file

@ -29,8 +29,8 @@
namespace Sci { namespace Sci {
EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor, uint32 flags) EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor)
: resMan(res), _kernel(kernel), _voc(voc), _gui(gui), _cursor(cursor), _flags(flags), _dirseeker(this) { : resMan(res), _kernel(kernel), _voc(voc), _gui(gui), _cursor(cursor), _dirseeker(this) {
gfx_state = 0; gfx_state = 0;
old_screen = 0; old_screen = 0;

4
engines/sci/engine/state.h
View file

@ -160,7 +160,7 @@ private:
struct EngineState : public Common::Serializable { struct EngineState : public Common::Serializable {
public: 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 ~EngineState();
virtual void saveLoadWithSerializer(Common::Serializer &ser); virtual void saveLoadWithSerializer(Common::Serializer &ser);
@ -171,8 +171,6 @@ public:
Kernel *_kernel; Kernel *_kernel;
Vocabulary *_voc; Vocabulary *_voc;
const uint32 _flags; /**< Specific game flags */
Common::String _gameName; /**< Designation of the primary object (which inherits from Game) */ Common::String _gameName; /**< Designation of the primary object (which inherits from Game) */
/* Non-VM information */ /* Non-VM information */

4
engines/sci/sci.cpp
View file

@ -126,8 +126,6 @@ Common::Error SciEngine::run() {
// FIXME/TODO: Move some of the stuff below to init() // FIXME/TODO: Move some of the stuff below to init()
const uint32 flags = getFlags();
_resMan = new ResourceManager(); _resMan = new ResourceManager();
if (!_resMan) { if (!_resMan) {
@ -142,7 +140,7 @@ Common::Error SciEngine::run() {
SciGuiCursor *cursor = new SciGuiCursor(_resMan, palette); SciGuiCursor *cursor = new SciGuiCursor(_resMan, palette);
// We'll set the GUI below // 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 // Gui change
//_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new //_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new