diff options
| author | Max Horn | 2009-05-30 20:37:33 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-30 20:37:33 +0000 |
| commit | 70a04c8b51af66fcc30b5b22fad224d0f145a484 (patch) | |
| tree | 85079d57325d352ff7567cd37392abf119e25b47 /engines/sci/engine | |
| parent | 539094d5a81fdb20e61a7a562ea7bbaed9c54e5f (diff) | |
| download | scummvm-rg350-70a04c8b51af66fcc30b5b22fad224d0f145a484.tar.gz scummvm-rg350-70a04c8b51af66fcc30b5b22fad224d0f145a484.tar.bz2 scummvm-rg350-70a04c8b51af66fcc30b5b22fad224d0f145a484.zip | |
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
svn-id: r41045
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/grammar.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/engine/kmovement.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kpathing.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp index 8afea247ae..3f022379e1 100644 --- a/engines/sci/engine/grammar.cpp +++ b/engines/sci/engine/grammar.cpp @@ -41,7 +41,7 @@ namespace Sci { #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; } diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 5c9058c09c..f9efcc735c 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -480,9 +480,9 @@ void _k_graph_rebuild_port_with_color(EngineState *s, gfx_color_t newbgcolor) { 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 @@ void _k_view_list_mark_free(EngineState *s, reg_t off) { } } -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 diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp index 85b3adf836..1de74326a6 100644 --- a/engines/sci/engine/kmovement.cpp +++ b/engines/sci/engine/kmovement.cpp @@ -237,7 +237,7 @@ enum Movecnt { 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: diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp index 07f8b2eb52..fa30392ead 100644 --- a/engines/sci/engine/kpathing.cpp +++ b/engines/sci/engine/kpathing.cpp @@ -255,7 +255,7 @@ struct PathfindingState { }; -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) { |