diff options
Diffstat (limited to 'engines/tinsel/tinlib.cpp')
-rw-r--r-- | engines/tinsel/tinlib.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 70ea8b8556..55f7446212 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -122,6 +122,8 @@ SCNHANDLE GetSceneHandle(); //----------------- GLOBAL GLOBAL DATA -------------------- +// FIXME: Avoid non-const global vars + bool bEnableMenu; static bool bInstantScroll = false; @@ -172,7 +174,7 @@ enum MASTER_LIB_CODES { HIGHEST_LIBCODE }; -const MASTER_LIB_CODES DW1DEMO_CODES[] = { +static const MASTER_LIB_CODES DW1DEMO_CODES[] = { ACTORREF, ACTORXPOS, ACTORYPOS, ADDTOPIC, ADDINV1, ADDINV2, AUXSCALE, BACKGROUND, CAMERA, CONTROL, CONVERSATION, CONVTOPIC, HIGHEST_LIBCODE, CURSORXPOS, CURSORYPOS, DECCONVW, DECCURSOR, DECTAGFONT, DECINVW, DECINV1, DECINV2, DECLEAD, DELICON, @@ -186,7 +188,7 @@ const MASTER_LIB_CODES DW1DEMO_CODES[] = { WALKTAG, RANDOM, TIMER }; -const MASTER_LIB_CODES DW1_CODES[] = { +static const MASTER_LIB_CODES DW1_CODES[] = { ACTORATTR, ACTORDIRECTION, ACTORREF, ACTORSCALE, ACTORXPOS, ACTORYPOS, ADDTOPIC, ADDINV1, ADDINV2, ADDOPENINV, AUXSCALE, BACKGROUND, CAMERA, CLOSEINVENTORY, CONTROL, CONVERSATION, @@ -213,7 +215,7 @@ const MASTER_LIB_CODES DW1_CODES[] = { HIGHEST_LIBCODE }; -const MASTER_LIB_CODES DW2DEMO_CODES[] = { +static const MASTER_LIB_CODES DW2DEMO_CODES[] = { ACTORBRIGHTNESS, ACTORDIRECTION, ACTORPALETTE, ACTORPRIORITY, ACTORREF, ACTORRGB, ACTORSCALE, ACTORXPOS, ACTORYPOS, ADDHIGHLIGHT, ADDINV, ADDINV1, ADDINV2, ADDOPENINV, ADDTOPIC, @@ -250,7 +252,7 @@ const MASTER_LIB_CODES DW2DEMO_CODES[] = { HIGHEST_LIBCODE }; -const MASTER_LIB_CODES DW2_CODES[] = { +static const MASTER_LIB_CODES DW2_CODES[] = { ACTORBRIGHTNESS, ACTORDIRECTION, ACTORPALETTE, ACTORPRIORITY, ACTORREF, ACTORRGB, ACTORSCALE, ACTORXPOS, ACTORYPOS, ADDHIGHLIGHT, ADDINV, ADDINV1, ADDINV2, ADDOPENINV, ADDTOPIC, @@ -292,6 +294,8 @@ const MASTER_LIB_CODES DW2_CODES[] = { //----------------- LOCAL GLOBAL DATA -------------------- +// FIXME: Avoid non-const global vars + // Saved cursor co-ordinates for control(on) to restore cursor position // as it was at control(off). // They are global so that MoveCursor(..) has a net effect if it |