diff options
| author | Max Horn | 2009-05-03 22:46:11 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-03 22:46:11 +0000 |
| commit | 82f2672008de3994c301aee92b3723f8deac6d98 (patch) | |
| tree | 1934aad7f35c25f010171ecafa3d6506fbbf20db /engines/sci/engine/kernel.cpp | |
| parent | 6a632b51ad7433cc9e04e2e5d68a108e6ba324b4 (diff) | |
| download | scummvm-rg350-82f2672008de3994c301aee92b3723f8deac6d98.tar.gz scummvm-rg350-82f2672008de3994c301aee92b3723f8deac6d98.tar.bz2 scummvm-rg350-82f2672008de3994c301aee92b3723f8deac6d98.zip | |
SCI: Changed SegManager to store the heap pointers in a Common::Arrray
svn-id: r40293
Diffstat (limited to 'engines/sci/engine/kernel.cpp')
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index 8089fc2d6e..226481cbcd 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -454,7 +454,7 @@ reg_t kMemory(EngineState *s, int funct_nr, int argc, reg_t *argv) { SCIkdebug(SCIkERROR, "Attempt to poke invalid memory at "PREG"!\n", PRINT_REG(argv[1])); return s->r_acc; } - if (s->seg_manager->heap[argv[1].segment]->getType() == MEM_OBJ_LOCALS) + if (s->seg_manager->_heap[argv[1].segment]->getType() == MEM_OBJ_LOCALS) return *((reg_t *) ref); else return make_reg(0, (int16)READ_LE_UINT16(ref)); @@ -468,7 +468,7 @@ reg_t kMemory(EngineState *s, int funct_nr, int argc, reg_t *argv) { return s->r_acc; } - if (s->seg_manager->heap[argv[1].segment]->getType() == MEM_OBJ_LOCALS) + if (s->seg_manager->_heap[argv[1].segment]->getType() == MEM_OBJ_LOCALS) *((reg_t *) ref) = argv[2]; else { if (argv[2].segment) { @@ -667,10 +667,10 @@ int determine_reg_type(EngineState *s, reg_t reg, int allow_invalid) { return KSIG_ARITHMETIC; } - if ((reg.segment >= s->seg_manager->heap_size) || !s->seg_manager->heap[reg.segment]) + if ((reg.segment >= s->seg_manager->_heap.size()) || !s->seg_manager->_heap[reg.segment]) return 0; // Invalid - mobj = s->seg_manager->heap[reg.segment]; + mobj = s->seg_manager->_heap[reg.segment]; switch (mobj->getType()) { case MEM_OBJ_SCRIPT: |