[Scummvm-cvs-logs] SF.net SVN: scummvm:[44099] scummvm/trunk/engines/sci/engine
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Sep 15 09:59:49 CEST 2009
Revision: 44099
http://scummvm.svn.sourceforge.net/scummvm/?rev=44099&view=rev
Author: thebluegr
Date: 2009-09-15 07:59:48 +0000 (Tue, 15 Sep 2009)
Log Message:
-----------
Removed some unused variables from the engine state
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/kgraphics.cpp
scummvm/trunk/engines/sci/engine/kmisc.cpp
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/engine/state.cpp
scummvm/trunk/engines/sci/engine/state.h
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-09-15 07:41:05 UTC (rev 44098)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-09-15 07:59:48 UTC (rev 44099)
@@ -267,8 +267,6 @@
// but this is correct
s->picture_port = new GfxPort(s->visual, s->gfx_state->pic_port_bounds, s->ega_colors[0], transparent);
- s->_pics.clear();
-
s->visual->add((GfxContainer *)s->visual, s->wm_port);
s->visual->add((GfxContainer *)s->visual, s->titlebar_port);
s->visual->add((GfxContainer *)s->visual, s->picture_port);
@@ -306,8 +304,6 @@
s->visual = NULL;
s->dyn_views = NULL;
s->port = NULL;
-
- s->_pics.clear();
}
int game_init_sound(EngineState *s, int sound_flags) {
@@ -322,7 +318,6 @@
// Architectural stuff: Init/Unintialize engine
int script_init_engine(EngineState *s) {
- s->kernel_opt_flags = 0;
s->segMan = new SegManager(s->resMan);
s->gc_countdown = GC_INTERVAL - 1;
@@ -366,7 +361,6 @@
debug(2, "Engine initialized");
s->pic_priority_table = NULL;
- s->_pics.clear();
return 0;
}
Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-09-15 07:41:05 UTC (rev 44098)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-09-15 07:59:48 UTC (rev 44099)
@@ -991,11 +991,8 @@
debugC(2, kDebugLevelGraphics, "Drawing pic.%03d\n", argv[0].toSint16());
if (add_to_pic) {
- s->_pics.push_back(dp);
gfxop_add_to_pic(s->gfx_state, dp.nr, picFlags, dp.palette);
} else {
- s->_pics.clear();
- s->_pics.push_back(dp);
gfxop_new_pic(s->gfx_state, dp.nr, picFlags, dp.palette);
}
Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp 2009-09-15 07:41:05 UTC (rev 44098)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp 2009-09-15 07:59:48 UTC (rev 44099)
@@ -118,12 +118,6 @@
uint32 start_time;
int retval = 0; // Avoid spurious warning
-#if 0
- // Reset optimization flags: If this function is called,
- // the game may be waiting for a timeout
- s->kernel_opt_flags &= ~(KERNEL_OPT_FLAG_GOT_EVENT | KERNEL_OPT_FLAG_GOT_2NDEVENT);
-#endif
-
g_system->getTimeAndDate(loc_time);
start_time = g_system->getMillis() - s->game_start_time;
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-09-15 07:41:05 UTC (rev 44098)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-09-15 07:59:48 UTC (rev 44099)
@@ -772,8 +772,6 @@
retval->have_bp = s->have_bp;
retval->bp_list = s->bp_list;
- retval->kernel_opt_flags = 0;
-
retval->successor = NULL;
retval->pic_priority_table = (int *)gfxop_get_pic_metainfo(retval->gfx_state);
retval->_gameName = retval->segMan->getObjectName(retval->game_obj);
Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp 2009-09-15 07:41:05 UTC (rev 44098)
+++ scummvm/trunk/engines/sci/engine/state.cpp 2009-09-15 07:59:48 UTC (rev 44099)
@@ -32,7 +32,6 @@
EngineState::EngineState(ResourceManager *res, uint32 flags)
: resMan(res), _flags(flags), _dirseeker(this) {
- widget_serial_counter = 0;
game_version = 0;
@@ -80,8 +79,6 @@
last_wait_time = 0;
- kernel_opt_flags = 0;
-
_fileHandles.resize(5);
execution_stack_base = 0;
Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h 2009-09-15 07:41:05 UTC (rev 44098)
+++ scummvm/trunk/engines/sci/engine/state.h 2009-09-15 07:59:48 UTC (rev 44099)
@@ -165,8 +165,6 @@
kLanguage getLanguage();
public:
- int widget_serial_counter; /**< Used for savegames */
-
ResourceManager *resMan; /**< The resource manager */
const uint32 _flags; /**< Specific game flags */
@@ -220,13 +218,9 @@
int priority_first; /**< The line where priority zone 0 ends */
int priority_last; /**< The line where the highest priority zone starts */
- Common::Array<drawn_pic_t> _pics;
-
uint32 game_start_time; /**< The time at which the interpreter was started */
uint32 last_wait_time; /**< The last time the game invoked Wait() */
- unsigned int kernel_opt_flags; /**< Kernel optimization flags- used for performance tweaking */
-
/* Kernel File IO stuff */
Common::Array<FileHandle> _fileHandles; /**< Array of file handles. Dynamically increased if required. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list