Removed some unused variables from the engine state

svn-id: r44099
This commit is contained in:
Filippos Karapetis 2009-09-15 07:59:48 +00:00
parent 7cbbc0ad25
commit e1de3d0f3f
6 changed files with 0 additions and 26 deletions

View File

@ -267,8 +267,6 @@ int _reset_graphics_input(EngineState *s) {
// 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 @@ static void _free_graphics_input(EngineState *s) {
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 @@ int game_init_sound(EngineState *s, int sound_flags) {
// 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 @@ int script_init_engine(EngineState *s) {
debug(2, "Engine initialized");
s->pic_priority_table = NULL;
s->_pics.clear();
return 0;
}

View File

@ -991,11 +991,8 @@ reg_t kDrawPic(EngineState *s, int, int argc, reg_t *argv) {
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);
}

View File

@ -118,12 +118,6 @@ reg_t kGetTime(EngineState *s, int, int argc, reg_t *argv) {
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;

View File

@ -772,8 +772,6 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
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);

View File

@ -32,7 +32,6 @@ namespace Sci {
EngineState::EngineState(ResourceManager *res, uint32 flags)
: resMan(res), _flags(flags), _dirseeker(this) {
widget_serial_counter = 0;
game_version = 0;
@ -80,8 +79,6 @@ EngineState::EngineState(ResourceManager *res, uint32 flags)
last_wait_time = 0;
kernel_opt_flags = 0;
_fileHandles.resize(5);
execution_stack_base = 0;

View File

@ -165,8 +165,6 @@ public:
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 @@ public:
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. */