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/agi.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/agi.cpp')
| -rw-r--r-- | engines/agi/agi.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 3c111fd5f0..8dd663ccbb 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -94,10 +94,8 @@ int AgiEngine::agiInit() { _game.adjMouseX = _game.adjMouseY = 0; // reset all flags to false and all variables to 0 - for (i = 0; i < MAX_FLAGS; i++) - _game.flags[i] = 0; - for (i = 0; i < MAX_VARS; i++) - _game.vars[i] = 0; + memset(_game.flags, 0, sizeof(_game.flags)); + memset(_game.vars, 0, sizeof(_game.vars)); // clear all resources and events for (i = 0; i < MAX_DIRECTORY_ENTRIES; i++) { @@ -606,7 +604,7 @@ void AgiEngine::loadingTrigger_NewRoom(int16 newRoomNr) { if (_game.nonBlockingTextShown) { _game.nonBlockingTextShown = false; - int16 curRoomNr = _game.vars[VM_VAR_CURRENT_ROOM]; + int16 curRoomNr = getVar(VM_VAR_CURRENT_ROOM); if (newRoomNr != curRoomNr) { if (!_game.automaticRestoreGame) { |