diff options
| author | D G Turner | 2012-10-12 17:03:32 +0100 |
|---|---|---|
| committer | D G Turner | 2012-10-12 17:03:32 +0100 |
| commit | 151b7beb47ec4b964862d6779bd48e3a33482bbd (patch) | |
| tree | 867717c5266d0908d95edd82560599be20a4ede9 /engines/sci/engine/scriptdebug.cpp | |
| parent | 80af0e239473f85c49cc2da3c848dfcde41d4a37 (diff) | |
| parent | 2b55837650c4229dc3d75b660cecfc7a3292e5e0 (diff) | |
| download | scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.gz scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.bz2 scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.zip | |
Merge branch 'master' into teenagentRefactor
Conflicts:
engines/teenagent/callbacks.cpp
Diffstat (limited to 'engines/sci/engine/scriptdebug.cpp')
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index d3abb9ff41..b2f22aa985 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -514,7 +514,7 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) { if (!objType) { debugN("End of script object (#0) encountered.\n"); - debugN("Classes: %i, Objects: %i, Export: %i,\n Var: %i (all base 10)", + debugN("Classes: %i, Objects: %i, Export: %i,\n Var: %i (all base 10)\n", objectctr[6], objectctr[1], objectctr[7], objectctr[10]); return; } @@ -527,7 +527,8 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) { _seeker += objsize; - objectctr[objType]++; + if (objType >= 0 && objType < ARRAYSIZE(objectctr)) + objectctr[objType]++; switch (objType) { case SCI_OBJ_OBJECT: |