diff options
| author | Max Horn | 2003-12-26 23:11:35 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-26 23:11:35 +0000 |
| commit | e3e6bb3191f57179874447b4f264721a2bc8a128 (patch) | |
| tree | 79599fadda78269c8031aae733574aff65194899 /scumm/verbs.cpp | |
| parent | 706d2f1e5a978c507666f6669aa3e21fc095a82a (diff) | |
| download | scummvm-rg350-e3e6bb3191f57179874447b4f264721a2bc8a128.tar.gz scummvm-rg350-e3e6bb3191f57179874447b4f264721a2bc8a128.tar.bz2 scummvm-rg350-e3e6bb3191f57179874447b4f264721a2bc8a128.zip | |
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables
svn-id: r11953
Diffstat (limited to 'scumm/verbs.cpp')
| -rw-r--r-- | scumm/verbs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp index 628df63457..faeac18fd8 100644 --- a/scumm/verbs.cpp +++ b/scumm/verbs.cpp @@ -267,7 +267,7 @@ void ScummEngine::redrawVerbs() { int i; int verb = (_cursor.state > 0 ? checkMouseOver(_mouse.x, _mouse.y) : 0); - for (i = _maxVerbs-1; i >= 0; i--) { + for (i = _numVerbs-1; i >= 0; i--) { if (i == verb && _verbs[verb].hicolor) drawVerb(i, 1); else @@ -286,7 +286,7 @@ void ScummEngine::checkExecVerbs() { if (_mouseButStat < MBS_MAX_KEY) { /* Check keypresses */ vs = &_verbs[1]; - for (i = 1; i < _maxVerbs; i++, vs++) { + for (i = 1; i < _numVerbs; i++, vs++) { if (vs->verbid && vs->saveid == 0 && vs->curmode == 1) { if (_mouseButStat == vs->key) { // Trigger verb as if the user clicked it @@ -340,7 +340,7 @@ void ScummEngine::verbMouseOver(int verb) { int ScummEngine::checkMouseOver(int x, int y) const { VerbSlot *vs; - int i = _maxVerbs - 1; + int i = _numVerbs - 1; vs = &_verbs[i]; do { @@ -503,7 +503,7 @@ void ScummEngine::drawVerbBitmap(int verb, int x, int y) { int ScummEngine::getVerbSlot(int id, int mode) const { int i; - for (i = 1; i < _maxVerbs; i++) { + for (i = 1; i < _numVerbs; i++) { if (_verbs[i].verbid == id && _verbs[i].saveid == mode) { return i; } |