[Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.75,1.76 logic.cpp,1.165,1.166 logic.h,1.108,1.109
Gregory Montoir
cyx at users.sourceforge.net
Thu Jan 8 15:29:02 CET 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv6226/queen
Modified Files:
graphics.cpp logic.cpp logic.h
Log Message:
minor Logic::initPerson() tweak
Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- graphics.cpp 8 Jan 2004 22:46:42 -0000 1.75
+++ graphics.cpp 8 Jan 2004 23:28:29 -0000 1.76
@@ -1139,7 +1139,9 @@
}
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::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;
}
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- logic.cpp 8 Jan 2004 22:46:42 -0000 1.165
+++ logic.cpp 8 Jan 2004 23:28:29 -0000 1.166
@@ -572,10 +572,10 @@
}
-void Logic::initPerson(int16 noun, const char *actorName, bool loadBank, Person *pp) {
+bool Logic::initPerson(int16 noun, const char *actorName, bool loadBank, Person *pp) {
if (noun <= 0) {
warning("Logic::initPerson() - Invalid object number: %i", noun);
- }
+ }
ActorData *pad = findActor(noun, actorName);
if (pad != NULL) {
pp->actor = pad;
@@ -591,7 +591,8 @@
// data is already loaded as it is contained in objects room bank (.bbk)
}
pp->bobFrame = 29 + FRAMES_JOE_XTRA + pp->actor->bobNum;
- }
+ }
+ return pad != NULL;
}
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- logic.h 8 Jan 2004 22:46:42 -0000 1.108
+++ logic.h 8 Jan 2004 23:28:29 -0000 1.109
@@ -146,7 +146,7 @@
void entryObj(int16 obj) { _entryObj = obj; }
ActorData *findActor(uint16 noun, const char *name = NULL);
- void initPerson(int16 noun, const char *actorName, bool loadBank, Person *pp);
+ bool initPerson(int16 noun, const char *actorName, bool loadBank, Person *pp);
uint16 findPersonNumber(uint16 obj) const;
void loadJoeBanks(const char *animBank, const char *standBank);
More information about the Scummvm-git-logs
mailing list