diff options
| author | Gregory Montoir | 2004-01-08 23:28:29 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-01-08 23:28:29 +0000 |
| commit | c4e9d55acbcab499cd8b76fcbbacb907a758a05f (patch) | |
| tree | 6bfced7b09e36c5a53f92f872d2cce8e553dd7da /queen/graphics.cpp | |
| parent | 2bc4c1e9cd10bc5a42026f1e0450dd6d39276e09 (diff) | |
| download | scummvm-rg350-c4e9d55acbcab499cd8b76fcbbacb907a758a05f.tar.gz scummvm-rg350-c4e9d55acbcab499cd8b76fcbbacb907a758a05f.tar.bz2 scummvm-rg350-c4e9d55acbcab499cd8b76fcbbacb907a758a05f.zip | |
minor Logic::initPerson() tweak
svn-id: r12270
Diffstat (limited to 'queen/graphics.cpp')
| -rw-r--r-- | queen/graphics.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/queen/graphics.cpp b/queen/graphics.cpp index 71cce80d91..56f4813caa 100644 --- a/queen/graphics.cpp +++ b/queen/graphics.cpp @@ -1139,7 +1139,9 @@ uint16 Graphics::setupPerson(uint16 noun, uint16 curImage) { } Person p; - _vm->logic()->initPerson(noun, "", true, &p); + if (!_vm->logic()->initPerson(noun, "", true, &p)) { + return curImage; + } const ActorData *pad = p.actor; uint16 scale = 100; @@ -1170,8 +1172,8 @@ uint16 Graphics::setupPerson(uint16 noun, uint16 curImage) { uint16 Graphics::allocPerson(uint16 noun, uint16 curImage) { Person p; - _vm->logic()->initPerson(noun, "", false, &p); - if (p.anim != NULL) { + if (_vm->logic()->initPerson(noun, "", false, &p) && p.anim != NULL) { + debug(0, "allocPerson() : anim=%s", p.anim); curImage += countAnimFrames(p.anim); _personFrames[p.actor->bobNum] = curImage + 1; } |