diff options
| author | Filippos Karapetis | 2011-11-05 02:53:08 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2011-11-05 03:00:42 +0200 |
| commit | 267c6f1756c9582b8bd9534334c7f264a2400929 (patch) | |
| tree | 3371fa3b24dc20abb4145f6e87291cdcf0e4b955 /engines/sci/engine/vm.cpp | |
| parent | d70d6c4c50942ec3679fce07ff6045b5d18ed9a1 (diff) | |
| download | scummvm-rg350-267c6f1756c9582b8bd9534334c7f264a2400929.tar.gz scummvm-rg350-267c6f1756c9582b8bd9534334c7f264a2400929.tar.bz2 scummvm-rg350-267c6f1756c9582b8bd9534334c7f264a2400929.zip | |
SCI: Made more fields of the Script class private. Some cleanup.
Diffstat (limited to 'engines/sci/engine/vm.cpp')
| -rw-r--r-- | engines/sci/engine/vm.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index c94fdac034..6b3a3198ea 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -593,15 +593,9 @@ void run_vm(EngineState *s) { if (!local_script) { error("Could not find local script from segment %x", s->xs->local_segment); } else { - s->variablesSegment[VAR_LOCAL] = local_script->_localsSegment; - if (local_script->_localsBlock) - s->variablesBase[VAR_LOCAL] = s->variables[VAR_LOCAL] = local_script->_localsBlock->_locals.begin(); - else - s->variablesBase[VAR_LOCAL] = s->variables[VAR_LOCAL] = NULL; - if (local_script->_localsBlock) - s->variablesMax[VAR_LOCAL] = local_script->_localsBlock->_locals.size(); - else - s->variablesMax[VAR_LOCAL] = 0; + s->variablesSegment[VAR_LOCAL] = local_script->getLocalsSegment(); + s->variablesBase[VAR_LOCAL] = s->variables[VAR_LOCAL] = local_script->getLocalsBegin(); + s->variablesMax[VAR_LOCAL] = local_script->getLocalsCount(); s->variablesMax[VAR_TEMP] = s->xs->sp - s->xs->fp; s->variablesMax[VAR_PARAM] = s->xs->argc + 1; } |