[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.114,1.115 cutaway.h,1.33,1.34
Gregory Montoir
cyx at users.sourceforge.net
Wed Jan 14 07:52:08 CET 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv27310/queen
Modified Files:
cutaway.cpp cutaway.h
Log Message:
bumped Cutaway::_personFace array size, as during intro Cutaway::_personFaceCount max value is 12
Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- cutaway.cpp 14 Jan 2004 14:34:04 -0000 1.114
+++ cutaway.cpp 14 Jan 2004 15:51:54 -0000 1.115
@@ -342,6 +342,7 @@
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 @@
if (!foundPerson) {
_personFaceCount++;
+ assert(_personFaceCount < MAX_PERSON_FACE_COUNT);
_personFace[_personFaceCount].index = object.objectNumber;
_personFace[_personFaceCount].image = _vm->logic()->objectData(object.objectNumber)->image;
}
Index: cutaway.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- cutaway.h 10 Jan 2004 12:56:07 -0000 1.33
+++ cutaway.h 14 Jan 2004 15:51:54 -0000 1.34
@@ -50,7 +50,7 @@
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,
More information about the Scummvm-git-logs
mailing list