From f5d846d482f2f692970e71e8764271cddb5be644 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 4 Sep 2009 07:21:51 +0000
Subject: Removed the animation_granularity variable from the engine state (it
 never changes, and it's used in one place only)

svn-id: r43936
---
 engines/sci/engine/kgraphics.cpp | 10 ++++++----
 engines/sci/engine/savegame.cpp  |  1 -
 engines/sci/engine/state.cpp     |  2 --
 engines/sci/engine/state.h       |  2 --
 engines/sci/sci.cpp              |  2 --
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 65ed3b7b4a..d3ff1bd7fe 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -2598,10 +2598,12 @@ static void animate_do_animation(EngineState *s, int argc, reg_t *argv) {
 	long animation_delay = 5;
 	int i, remaining_checkers;
 	int update_counter;
-	int granularity0 = s->animation_granularity << 1;
-	int granularity1 = s->animation_granularity;
-	int granularity2 = s->animation_granularity >> 2;
-	int granularity3 = s->animation_granularity >> 4;
+	// Number of animation steps to perform betwen updates for transition animations
+	int animation_granularity = 4;
+	int granularity0 = animation_granularity << 1;
+	int granularity1 = animation_granularity;
+	int granularity2 = animation_granularity >> 2;
+	int granularity3 = animation_granularity >> 4;
 	char checkers[32 * 19];
 	gfx_pixmap_t *newscreen = gfxop_grab_pixmap(s->gfx_state, gfx_rect(0, 10, 320, 190));
 
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index f54d8b77de..96343cb300 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -700,7 +700,6 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 
 	// Now copy all current state information
 	// Graphics and input state:
-	retval->animation_granularity = s->animation_granularity;
 	retval->gfx_state = s->gfx_state;
 	retval->old_screen = 0;
 
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index a4b92b5ff9..78ace4e6e7 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -73,8 +73,6 @@ EngineState::EngineState(ResourceManager *res, uint32 flags)
 
 	drop_views = 0;
 
-	animation_granularity = 0;
-
 	_menubar = 0;
 
 	priority_first = 0;
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 4a6553e65a..2ac9d0bd12 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -218,8 +218,6 @@ public:
 	GfxList *dyn_views; /**< Pointers to pic and dynamic view lists */
 	GfxList *drop_views; /**< A list Animate() can dump dropped dynviews into */
 
-	int animation_granularity; /**< Number of animation steps to perform betwen updates for transition animations */
-
 	Menubar *_menubar; /**< The menu bar */
 
 	int priority_first; /**< The line where priority zone 0 ends */
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index c9e2c4ba3a..ea7a835684 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -157,8 +157,6 @@ Common::Error SciEngine::run() {
 	GfxState gfx_state;
 	_gamestate->gfx_state = &gfx_state;
 
-	_gamestate->animation_granularity = 4;
-
 	// Assign default values to the config manager, in case settings are missing
 	ConfMan.registerDefault("cursor_filter", "0");
 	ConfMan.registerDefault("view_filter", "0");
-- 
cgit v1.2.3