diff options
| author | James Brown | 2003-01-16 17:37:34 +0000 |
|---|---|---|
| committer | James Brown | 2003-01-16 17:37:34 +0000 |
| commit | 4e07c1bb91d2fc2a2ab7156b5a252591d3ac1848 (patch) | |
| tree | 9377fc2d8931c6afc7ef024305ae040db20a9e87 /scumm/scummvm.cpp | |
| parent | d5a266f2ca7ca39b31286d8f34eae26a2919ba8e (diff) | |
| download | scummvm-rg350-4e07c1bb91d2fc2a2ab7156b5a252591d3ac1848.tar.gz scummvm-rg350-4e07c1bb91d2fc2a2ab7156b5a252591d3ac1848.tar.bz2 scummvm-rg350-4e07c1bb91d2fc2a2ab7156b5a252591d3ac1848.zip | |
Patch 668634: Actor iteration fix
svn-id: r6484
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index e3c8b33a72..1c4019fa06 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -233,7 +233,8 @@ void Scumm::scummInit() // Allocate and Initialize actors _actors = new Actor[NUM_ACTORS]; - for (i = 1, a = getFirstActor(); ++a, i < NUM_ACTORS; i++) { + for (i = 1; i < NUM_ACTORS; i++) { + a = derefActor(i); a->number = i; a->initActorClass(this); a->initActor(1); @@ -620,7 +621,8 @@ void Scumm::startScene(int room, Actor * a, int objectNr) clearEnqueue(); stopCycle(0); - for (i = 1, at = getFirstActor(); ++at, i < NUM_ACTORS; i++) { + for (i = 1; i < NUM_ACTORS; i++) { + at = derefActor(i); at->hideActor(); } |