aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel/pdisplay.cpp
diff options
context:
space:
mode:
authorMax Horn2010-11-16 09:53:55 +0000
committerMax Horn2010-11-16 09:53:55 +0000
commit1dbf8d73d56052654522cf4076490090a41f336b (patch)
tree4ec9fd566c75859793a1fe72b78d025a87ac03d0 /engines/tinsel/pdisplay.cpp
parentada9c9af608f1af9d00289f4aa2b7be868e2944f (diff)
downloadscummvm-rg350-1dbf8d73d56052654522cf4076490090a41f336b.tar.gz
scummvm-rg350-1dbf8d73d56052654522cf4076490090a41f336b.tar.bz2
scummvm-rg350-1dbf8d73d56052654522cf4076490090a41f336b.zip
TINSEL: Mark all (?) global vars with a FIXME comment
Use of global vars is what prevents RTL from working in Tinsel (and probably in other engines). More specifically, the fact that many global vars are not explicitly inited when the engine is (re)launched. svn-id: r54262
Diffstat (limited to 'engines/tinsel/pdisplay.cpp')
-rw-r--r--engines/tinsel/pdisplay.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp
index d55f8be260..38748b703b 100644
--- a/engines/tinsel/pdisplay.cpp
+++ b/engines/tinsel/pdisplay.cpp
@@ -72,6 +72,8 @@ enum HotSpotTag {
//----------------- LOCAL GLOBAL DATA --------------------
+// FIXME: Avoid non-const global vars
+
static bool DispPath = false;
static bool bShowString = false;
@@ -375,6 +377,7 @@ static bool InHotSpot(int ano, int aniX, int aniY, int *pxtext, int *pytext) {
* the screen.
*/
static bool ActorTag(int curX, int curY, HotSpotTag *pTag, OBJECT **ppText) {
+ // FIXME: Avoid non-const global vars
static int tagX = 0, tagY = 0; // Values when tag was displayed
int newX, newY; // new values, to keep tag in place
int ano;
@@ -486,6 +489,7 @@ static bool ActorTag(int curX, int curY, HotSpotTag *pTag, OBJECT **ppText) {
* code contains a printtag() call, its tagState flag gets set to TAG_ON.
*/
static bool PolyTag(HotSpotTag *pTag, OBJECT **ppText) {
+ // FIXME: Avoid non-const global vars
static int Loffset = 0, Toffset = 0; // Values when tag was displayed
static int curX = 0, curY = 0;
int nLoff, nToff; // new values, to keep tag in place