diff options
| author | Sven Hesse | 2009-06-22 10:13:37 +0000 |
|---|---|---|
| committer | Sven Hesse | 2009-06-22 10:13:37 +0000 |
| commit | 962fc19b57a13cb8de2c194f325e6c9b8b4fc1a0 (patch) | |
| tree | 1b9a2d45822acf5c6b4dfab3229d36d8db61c3ac /engines/gob/map_v4.cpp | |
| parent | dd9e62e31e18188f43980b24ac9cc5c2ae00623f (diff) | |
| download | scummvm-rg350-962fc19b57a13cb8de2c194f325e6c9b8b4fc1a0.tar.gz scummvm-rg350-962fc19b57a13cb8de2c194f325e6c9b8b4fc1a0.tar.bz2 scummvm-rg350-962fc19b57a13cb8de2c194f325e6c9b8b4fc1a0.zip | |
Encapsulating script file access
svn-id: r41753
Diffstat (limited to 'engines/gob/map_v4.cpp')
| -rw-r--r-- | engines/gob/map_v4.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/gob/map_v4.cpp b/engines/gob/map_v4.cpp index 858e7972bc..76492eae1b 100644 --- a/engines/gob/map_v4.cpp +++ b/engines/gob/map_v4.cpp @@ -31,7 +31,7 @@ #include "gob/goblin.h" #include "gob/inter.h" #include "gob/game.h" -#include "gob/parse.h" +#include "gob/script.h" #include "gob/mult.h" namespace Gob { @@ -53,10 +53,10 @@ void Map_v4::loadMapObjects(const char *avjFile) { uint32 tmpPos; uint32 passPos; - var = _vm->_parse->parseVarIndex(); + var = _vm->_game->_script->readVarIndex(); variables = _vm->_inter->_variables->getAddressOff8(var); - id = _vm->_inter->load16(); + id = _vm->_game->_script->readInt16(); if (((uint16) id) >= 65520) { warning("Woodruff Stub: loadMapObjects ID >= 65520"); @@ -146,7 +146,7 @@ void Map_v4::loadMapObjects(const char *avjFile) { for (int i = 0; i < _vm->_goblin->_gobsCount; i++) loadGoblinStates(mapData, i); - _vm->_goblin->_soundSlotsCount = _vm->_inter->load16(); + _vm->_goblin->_soundSlotsCount = _vm->_game->_script->readInt16(); for (int i = 0; i < _vm->_goblin->_soundSlotsCount; i++) _vm->_goblin->_soundSlots[i] = _vm->_inter->loadSound(1); |