diff options
| author | Max Horn | 2003-05-08 15:48:50 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-08 15:48:50 +0000 |
| commit | 98881c3a6a513c27a06e596c29e0b40b355844f6 (patch) | |
| tree | a6ddbd3a2e3aa483bae3d82e63fa2ccb6fc40f13 /scumm/dialogs.cpp | |
| parent | 6ab104cc3ca433b672318b3e9bde26f7e882940c (diff) | |
| download | scummvm-rg350-98881c3a6a513c27a06e596c29e0b40b355844f6.tar.gz scummvm-rg350-98881c3a6a513c27a06e596c29e0b40b355844f6.tar.bz2 scummvm-rg350-98881c3a6a513c27a06e596c29e0b40b355844f6.zip | |
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning
svn-id: r7393
Diffstat (limited to 'scumm/dialogs.cpp')
| -rw-r--r-- | scumm/dialogs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index f27505ff5e..9544330f9f 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -177,9 +177,9 @@ const ScummVM::String ScummDialog::queryResString(int stringno) { return String(); if (_scumm->_features & GF_AFTER_V7) - string = _scumm->_vars[string_map_table_v7[stringno - 1].num]; + string = _scumm->readVar(string_map_table_v7[stringno - 1].num); else if (_scumm->_features & GF_AFTER_V6) - string = _scumm->_vars[string_map_table_v6[stringno - 1].num]; + string = _scumm->readVar(string_map_table_v6[stringno - 1].num); else string = string_map_table_v5[stringno - 1].num; |