diff options
| author | Max Horn | 2004-01-19 19:47:47 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-19 19:47:47 +0000 |
| commit | e8164dfb705ef94dcc237bbd2a6bafd8d772d617 (patch) | |
| tree | e593da27169d148988655d2a4f39b36f03c00232 /scumm/vars.cpp | |
| parent | d094989ae24bfba1cbff2f7a230d3b68e51c68bb (diff) | |
| download | scummvm-rg350-e8164dfb705ef94dcc237bbd2a6bafd8d772d617.tar.gz scummvm-rg350-e8164dfb705ef94dcc237bbd2a6bafd8d772d617.tar.bz2 scummvm-rg350-e8164dfb705ef94dcc237bbd2a6bafd8d772d617.zip | |
moved some V6-only scumm vars to ScummEngine_v6
svn-id: r12517
Diffstat (limited to 'scumm/vars.cpp')
| -rw-r--r-- | scumm/vars.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/scumm/vars.cpp b/scumm/vars.cpp index ab2880c897..4fab7884de 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -81,7 +81,6 @@ void ScummEngine::setupScummVars() { VAR_USERPUT = 53; VAR_SOUNDRESULT = 56; VAR_TALKSTOP_KEY = 57; - VAR_59 = 59; VAR_NOSUBTITLES = 60; // for loomcd VAR_SOUNDPARAM = 64; @@ -151,7 +150,7 @@ void ScummEngine_v6::setupScummVars() { VAR_V6_SCREEN_WIDTH = 41; VAR_V6_SCREEN_HEIGHT = 54; VAR_V6_EMSSPACE = 76; - VAR_V6_RANDOM_NR = 118; + VAR_RANDOM_NR = 118; VAR_V6_SOUNDMODE = 9; @@ -187,7 +186,7 @@ void ScummEngine_v7::setupScummVars() { VAR_PERFORMANCE_2 = 27; VAR_GAME_LOADED = 29; VAR_V6_EMSSPACE = 32; - VAR_V6_RANDOM_NR = 34; + VAR_RANDOM_NR = 34; VAR_NEW_ROOM = 35; VAR_WALKTO_OBJ = 36; @@ -303,6 +302,13 @@ void ScummEngine_v8::setupScummVars() { VAR_MAINMENU_KEY = 65; VAR_TALKSTOP_KEY = 67; + VAR_CUSTOMSCALETABLE = 111; + + VAR_TIMER_NEXT = 112; + VAR_TMR_1 = 113; + VAR_TMR_2 = 114; + VAR_TMR_3 = 115; + VAR_CAMERA_MIN_X = 116; VAR_CAMERA_MAX_X = 117; VAR_CAMERA_MIN_Y = 118; @@ -314,13 +320,6 @@ void ScummEngine_v8::setupScummVars() { VAR_CAMERA_THRESHOLD_X = 124; VAR_CAMERA_THRESHOLD_Y = 125; - VAR_CUSTOMSCALETABLE = 111; - - VAR_TIMER_NEXT = 112; - VAR_TMR_1 = 113; - VAR_TMR_2 = 114; - VAR_TMR_3 = 115; - VAR_EGO = 126; VAR_DEBUGMODE = 130; |