diff options
| author | Martin Kiewitz | 2016-01-31 17:35:13 +0100 |
|---|---|---|
| committer | Martin Kiewitz | 2016-01-31 17:35:13 +0100 |
| commit | 82b958f274affa9d67de0ac2f8cfaa1756405dfb (patch) | |
| tree | 93ed89bed22d6528a4a27957f2bc4343229e7361 /engines/agi/checks.cpp | |
| parent | 1548f2cebf49b52505b17c4057ad8048ce6c9baf (diff) | |
| download | scummvm-rg350-82b958f274affa9d67de0ac2f8cfaa1756405dfb.tar.gz scummvm-rg350-82b958f274affa9d67de0ac2f8cfaa1756405dfb.tar.bz2 scummvm-rg350-82b958f274affa9d67de0ac2f8cfaa1756405dfb.zip | |
AGI: VM Var code cleanup
Don't access variables directly, but through method
Shouldn't include any functional differences
Also changed several hardcoded values to the corresponding enums.
Diffstat (limited to 'engines/agi/checks.cpp')
| -rw-r--r-- | engines/agi/checks.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/agi/checks.cpp b/engines/agi/checks.cpp index 1734517163..2ad0dbdd2d 100644 --- a/engines/agi/checks.cpp +++ b/engines/agi/checks.cpp @@ -185,9 +185,9 @@ void AgiEngine::updatePosition() { ScreenObjEntry *screenObj; int x, y, oldX, oldY, border; - _game.vars[VM_VAR_BORDER_CODE] = 0; - _game.vars[VM_VAR_BORDER_TOUCH_EGO] = 0; - _game.vars[VM_VAR_BORDER_TOUCH_OBJECT] = 0; + setVar(VM_VAR_BORDER_CODE, 0); + setVar(VM_VAR_BORDER_TOUCH_EGO, 0); + setVar(VM_VAR_BORDER_TOUCH_OBJECT, 0); for (screenObj = _game.screenObjTable; screenObj < &_game.screenObjTable[SCREENOBJECTS_MAX]; screenObj++) { if ((screenObj->flags & (fAnimated | fUpdate | fDrawn)) != (fAnimated | fUpdate | fDrawn)) { @@ -271,10 +271,10 @@ void AgiEngine::updatePosition() { if (border) { if (isEgoView(screenObj)) { - _game.vars[VM_VAR_BORDER_TOUCH_EGO] = border; + setVar(VM_VAR_BORDER_TOUCH_EGO, border); } else { - _game.vars[VM_VAR_BORDER_CODE] = screenObj->objectNr; - _game.vars[VM_VAR_BORDER_TOUCH_OBJECT] = border; + setVar(VM_VAR_BORDER_CODE, screenObj->objectNr); + setVar(VM_VAR_BORDER_TOUCH_OBJECT, border); } if (screenObj->motionType == kMotionMoveObj) { motionMoveObjStop(screenObj); |