diff options
| author | Max Horn | 2010-11-16 09:53:55 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-16 09:53:55 +0000 |
| commit | 1dbf8d73d56052654522cf4076490090a41f336b (patch) | |
| tree | 4ec9fd566c75859793a1fe72b78d025a87ac03d0 /engines/tinsel/scene.cpp | |
| parent | ada9c9af608f1af9d00289f4aa2b7be868e2944f (diff) | |
| download | scummvm-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/scene.cpp')
| -rw-r--r-- | engines/tinsel/scene.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp index 33d4e67d70..8f0f4771e3 100644 --- a/engines/tinsel/scene.cpp +++ b/engines/tinsel/scene.cpp @@ -106,6 +106,8 @@ struct ENTRANCE_STRUC { //----------------- LOCAL GLOBAL DATA -------------------- +// FIXME: Avoid non-const global vars + #ifdef DEBUG static bool ShowPosition = false; // Set when showpos() has been called #endif @@ -368,6 +370,10 @@ void EndScene() { */ void PrimeBackground() { // structure for playfields + // FIXME: Avoid non-const global vars + // TODO: We should simply merge this function with InitBackground + // in order to avoid the static var and the problems associate + // with it. static PLAYFIELD playfield[] = { { // FIELD WORLD NULL, // display list @@ -390,7 +396,7 @@ void PrimeBackground() { }; // structure for background - static BACKGND backgnd = { + static const BACKGND backgnd = { BLACK, // sky colour Common::Point(0, 0), // initial world pos Common::Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), // scroll limits |