diff options
| author | Gregory Montoir | 2004-01-14 15:51:54 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-01-14 15:51:54 +0000 |
| commit | b1141ae71718d4693c637d4c169bef37ae1cc036 (patch) | |
| tree | c56c5b5b9bc88d36e0aa64e3bf5f17e36179109d /queen | |
| parent | 4bc769c33b7e246bb149d5f9958e646d771818c7 (diff) | |
| download | scummvm-rg350-b1141ae71718d4693c637d4c169bef37ae1cc036.tar.gz scummvm-rg350-b1141ae71718d4693c637d4c169bef37ae1cc036.tar.bz2 scummvm-rg350-b1141ae71718d4693c637d4c169bef37ae1cc036.zip | |
bumped Cutaway::_personFace array size, as during intro Cutaway::_personFaceCount max value is 12
svn-id: r12388
Diffstat (limited to 'queen')
| -rw-r--r-- | queen/cutaway.cpp | 2 | ||||
| -rw-r--r-- | queen/cutaway.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index a1fb7ef3d3..63a0d9c127 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -342,6 +342,7 @@ void Cutaway::changeRooms(CutawayObject &object) { if (objectData->image == -3 || objectData->image == -4) { + assert(_personDataCount < MAX_PERSON_COUNT); // The object is a person! So record the details... _personData[_personDataCount].index = i; _personData[_personDataCount].name = objectData->name; @@ -835,6 +836,7 @@ void Cutaway::handlePersonRecord( if (!foundPerson) { _personFaceCount++; + assert(_personFaceCount < MAX_PERSON_FACE_COUNT); _personFace[_personFaceCount].index = object.objectNumber; _personFace[_personFaceCount].image = _vm->logic()->objectData(object.objectNumber)->image; } diff --git a/queen/cutaway.h b/queen/cutaway.h index 92cd9483ae..5c44a731a5 100644 --- a/queen/cutaway.h +++ b/queen/cutaway.h @@ -50,7 +50,7 @@ class Cutaway { MAX_BANK_NAME_COUNT = 5, MAX_FILENAME_LENGTH = 12, MAX_FILENAME_SIZE = (MAX_FILENAME_LENGTH + 1), - MAX_PERSON_FACE_COUNT = 12, + MAX_PERSON_FACE_COUNT = 13, MAX_STRING_LENGTH = 255, MAX_STRING_SIZE = (MAX_STRING_LENGTH + 1), LEFT = 1, |