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

[thebluegr at users.sourceforge.net]

Revision: 43936
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43936&view=rev
Author:   thebluegr
Date:     2009-09-04 07:21:51 +0000 (Fri, 04 Sep 2009)

Log Message:
-----------
Removed the animation_granularity variable from the engine state (it never changes, and it's used in one place only)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    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/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-09-04 07:17:34 UTC (rev 43935)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-09-04 07:21:51 UTC (rev 43936)
@@ -2598,10 +2598,12 @@
 	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));
 

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-09-04 07:17:34 UTC (rev 43935)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-09-04 07:21:51 UTC (rev 43936)
@@ -700,7 +700,6 @@
 
 	// 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;
 

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2009-09-04 07:17:34 UTC (rev 43935)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2009-09-04 07:21:51 UTC (rev 43936)
@@ -73,8 +73,6 @@
 
 	drop_views = 0;
 
-	animation_granularity = 0;
-
 	_menubar = 0;
 
 	priority_first = 0;

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2009-09-04 07:17:34 UTC (rev 43935)
+++ scummvm/trunk/engines/sci/engine/state.h	2009-09-04 07:21:51 UTC (rev 43936)
@@ -218,8 +218,6 @@
 	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 */

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2009-09-04 07:17:34 UTC (rev 43935)
+++ scummvm/trunk/engines/sci/sci.cpp	2009-09-04 07:21:51 UTC (rev 43936)
@@ -157,8 +157,6 @@
 	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");


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