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

[fingolfin at users.sourceforge.net]

Revision: 41045
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41045&view=rev
Author:   fingolfin
Date:     2009-05-30 20:37:33 +0000 (Sat, 30 May 2009)

Log Message:
-----------
SCI: Made vocab_version static again (a global static var is bad, but a really global var is worse); also clarified some FIXME comments that we want to avoid *any* non-const global var, no matter whether it is static or not

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/grammar.cpp
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/kmovement.cpp
    scummvm/trunk/engines/sci/engine/kpathing.cpp
    scummvm/trunk/engines/sci/gfx/operations.cpp
    scummvm/trunk/engines/sci/sfx/core.cpp
    scummvm/trunk/engines/sci/vocabulary.cpp

Modified: scummvm/trunk/engines/sci/engine/grammar.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/grammar.cpp	2009-05-30 20:19:20 UTC (rev 41044)
+++ scummvm/trunk/engines/sci/engine/grammar.cpp	2009-05-30 20:37:33 UTC (rev 41045)
@@ -41,7 +41,7 @@
 #define TOKEN_NON_NT (TOKEN_OPAREN | TOKEN_TERMINAL_CLASS | TOKEN_TERMINAL_GROUP | TOKEN_STUFFING_WORD)
 #define TOKEN_TERMINAL (TOKEN_TERMINAL_CLASS | TOKEN_TERMINAL_GROUP)
 
-static int _allocd_rules = 0;	// FIXME: Avoid static vars
+static int _allocd_rules = 0;	// FIXME: Avoid non-cpnst global vars
 
 int getAllocatedRulesCount() { return _allocd_rules; }
 

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-05-30 20:19:20 UTC (rev 41044)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-05-30 20:37:33 UTC (rev 41045)
@@ -480,9 +480,9 @@
 	delete port;
 }
 
-static bool activated_icon_bar = false;	// FIXME: Avoid static vars
-static int port_origin_x = 0;	// FIXME: Avoid static vars
-static int port_origin_y = 0;	// FIXME: Avoid static vars
+static bool activated_icon_bar = false;	// FIXME: Avoid non-cpnst global vars
+static int port_origin_x = 0;	// FIXME: Avoid non-cpnst global vars
+static int port_origin_y = 0;	// FIXME: Avoid non-cpnst global vars
 
 reg_t kGraph(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	rect_t area;
@@ -1776,7 +1776,7 @@
 	}
 }
 
-static bool _k_animate_ran = false;	// FIXME: Avoid static vars
+static bool _k_animate_ran = false;	// FIXME: Avoid non-cpnst global vars
 
 int _k_view_list_dispose_loop(EngineState *s, List *list, GfxDynView *widget, int funct_nr, int argc, reg_t *argv) {
 // disposes all list members flagged for disposal; funct_nr is the invoking kfunction

Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp	2009-05-30 20:19:20 UTC (rev 41044)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp	2009-05-30 20:37:33 UTC (rev 41045)
@@ -237,7 +237,7 @@
 	UNINITIALIZED
 };
 
-static Movecnt handle_movecnt = UNINITIALIZED;	// FIXME: Avoid static vars
+static Movecnt handle_movecnt = UNINITIALIZED;	// FIXME: Avoid non-cpnst global vars
 
 /**
  * Address parameters may be passed in one of three forms:

Modified: scummvm/trunk/engines/sci/engine/kpathing.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kpathing.cpp	2009-05-30 20:19:20 UTC (rev 41044)
+++ scummvm/trunk/engines/sci/engine/kpathing.cpp	2009-05-30 20:37:33 UTC (rev 41045)
@@ -255,7 +255,7 @@
 };
 
 
-static Vertex *s_vertex_cur;	// FIXME: Avoid static vars
+static Vertex *s_vertex_cur;	// FIXME: Avoid non-cpnst global vars
 
 // FIXME: Temporary hack to deal with points in reg_ts
 static bool polygon_is_reg_t(const byte *list, int size) {

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-05-30 20:19:20 UTC (rev 41044)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-05-30 20:37:33 UTC (rev 41045)
@@ -1382,7 +1382,7 @@
 }
 
 static sci_event_t scummvm_get_event(gfx_driver_t *drv) {
-	static int _modifierStates = 0;	// FIXME: EVIL HACK
+	static int _modifierStates = 0;	// FIXME: Avoid non-cpnst global vars
 	sci_event_t input = { SCI_EVT_NONE, 0, 0, 0 };
 
 	Common::EventManager *em = g_system->getEventManager();

Modified: scummvm/trunk/engines/sci/sfx/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.cpp	2009-05-30 20:19:20 UTC (rev 41044)
+++ scummvm/trunk/engines/sci/sfx/core.cpp	2009-05-30 20:37:33 UTC (rev 41045)
@@ -44,7 +44,7 @@
 namespace Sci {
 
 class SfxPlayer;
-SfxPlayer *player = NULL;		// FIXME: Avoid static vars
+SfxPlayer *player = NULL;	// FIXME: Avoid non-cpnst global vars
 
 
 #pragma mark -

Modified: scummvm/trunk/engines/sci/vocabulary.cpp
===================================================================
--- scummvm/trunk/engines/sci/vocabulary.cpp	2009-05-30 20:19:20 UTC (rev 41044)
+++ scummvm/trunk/engines/sci/vocabulary.cpp	2009-05-30 20:37:33 UTC (rev 41045)
@@ -32,7 +32,7 @@
 
 namespace Sci {
 
-int vocab_version = 0;
+static int vocab_version = 0;	// FIXME: Avoid non-cpnst global vars
 
 #if 0
 


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