aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/map_v2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/gob/map_v2.cpp')
-rw-r--r--engines/gob/map_v2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp
index db4f2075e1..040285e004 100644
--- a/engines/gob/map_v2.cpp
+++ b/engines/gob/map_v2.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 {
@@ -55,10 +55,10 @@ void Map_v2::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 (id == -1) {
_passMap = (int8 *) _vm->_inter->_variables->getAddressOff8(var);
@@ -130,7 +130,7 @@ void Map_v2::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);