diff options
| author | Travis Howell | 2004-07-24 11:15:59 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-07-24 11:15:59 +0000 |
| commit | 7550ebed81d784ef26a673ee05498682bdf50c1f (patch) | |
| tree | b2f4823390d65bf317bed9b0946653ebd6db3eb7 | |
| parent | 546fd77e1b60d2f5f137ce13422ea0fadf4a5ba6 (diff) | |
| download | scummvm-rg350-7550ebed81d784ef26a673ee05498682bdf50c1f.tar.gz scummvm-rg350-7550ebed81d784ef26a673ee05498682bdf50c1f.tar.bz2 scummvm-rg350-7550ebed81d784ef26a673ee05498682bdf50c1f.zip | |
Rename VAR
svn-id: r14318
| -rw-r--r-- | scumm/scumm.cpp | 4 | ||||
| -rw-r--r-- | scumm/scumm.h | 4 | ||||
| -rw-r--r-- | scumm/vars.cpp | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index fe3e98828c..2b54a7a1c6 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -675,8 +675,8 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS VAR_SOUNDPARAM2 = 0xFF; VAR_SOUNDPARAM3 = 0xFF; VAR_MOUSEPRESENT = 0xFF; - VAR_PERFORMANCE_1 = 0xFF; - VAR_PERFORMANCE_2 = 0xFF; + VAR_MEMORY_PERFORMANCE = 0xFF; + VAR_VIDEO_PERFORMANCE = 0xFF; VAR_ROOM_FLAG = 0xFF; VAR_GAME_LOADED = 0xFF; VAR_NEW_ROOM = 0xFF; diff --git a/scumm/scumm.h b/scumm/scumm.h index 2832bd0495..84b9100de0 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -1211,8 +1211,8 @@ public: byte VAR_SOUNDPARAM2; byte VAR_SOUNDPARAM3; byte VAR_MOUSEPRESENT; - byte VAR_PERFORMANCE_1; - byte VAR_PERFORMANCE_2; + byte VAR_MEMORY_PERFORMANCE; + byte VAR_VIDEO_PERFORMANCE; byte VAR_ROOM_FLAG; byte VAR_GAME_LOADED; byte VAR_NEW_ROOM; diff --git a/scumm/vars.cpp b/scumm/vars.cpp index b2b7237758..e82d1fd47d 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -93,8 +93,8 @@ void ScummEngine::setupScummVars() { if (_version >= 5) { VAR_FADE_DELAY = 59; VAR_MOUSEPRESENT = 67; - VAR_PERFORMANCE_1 = 68; - VAR_PERFORMANCE_2 = 69; // Zak256 Note: Cashcard for Zak + VAR_MEMORY_PERFORMANCE = 68; + VAR_VIDEO_PERFORMANCE = 69; // Zak256 Note: Cashcard for Zak VAR_ROOM_FLAG = 70; // Zak256 Note: Cashcard for Annie VAR_GAME_LOADED = 71; // Zak256 Note: Cashcard for Melissa VAR_NEW_ROOM = 72; // Zak256 Note: Cashcard for Leslie @@ -234,8 +234,8 @@ void ScummEngine_v7he::setupScummVars() { VAR_SOUNDPARAM = 51; VAR_MUSIC_TIMER = 52; - VAR_PERFORMANCE_1 = 57; - VAR_PERFORMANCE_2 = 58; + VAR_MEMORY_PERFORMANCE = 57; + VAR_VIDEO_PERFORMANCE = 58; VAR_NEW_ROOM = 59; VAR_TMR_1 = 60; VAR_TMR_2 = 61; @@ -277,8 +277,8 @@ void ScummEngine_v7::setupScummVars() { VAR_LEFTBTN_HOLD = 24; VAR_RIGHTBTN_HOLD = 25; - VAR_PERFORMANCE_1 = 26; - VAR_PERFORMANCE_2 = 27; + VAR_MEMORY_PERFORMANCE = 26; + VAR_VIDEO_PERFORMANCE = 27; VAR_GAME_LOADED = 29; VAR_V6_EMSSPACE = 32; VAR_VOICE_MODE = 33; // 0 is voice, 1 is voice+text, 2 is text only |