[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.195,1.196 actor.h,1.96,1.97 sfuncs.cpp,1.172,1.173

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12612

Modified Files:
	actor.cpp actor.h sfuncs.cpp 
Log Message:
Now load actors only on demand. That lets select Nimdok (doctor) part. Just
click on him and move mouse away quickly, so it will not try to get actor's
name which is broken ATM.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- actor.cpp	9 Oct 2005 01:18:26 -0000	1.195
+++ actor.cpp	9 Oct 2005 01:43:07 -0000	1.196
@@ -482,7 +482,10 @@
 
 	for (i = 0; i < _actorsCount; i++) {
 		actor = _actors[i];
-		loadActorResources(actor);
+		if (actor->_flags & kProtagonist) {
+			loadActorResources(actor);
+			break;
+		}
 	}
 
 	_centerActor = _protagonist = _actors[protagonistIdx];

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- actor.h	8 Oct 2005 22:09:20 -0000	1.96
+++ actor.h	9 Oct 2005 01:43:08 -0000	1.97
@@ -590,8 +590,11 @@
 	void freeObjList();
 	void loadObjList(int objectCount, int objectsResourceID);
 
-private:
+protected:
+	friend class Script;
 	bool loadActorResources(ActorData *actor);
+
+private:
 	void stepZoneAction(ActorData *actor, const HitZone *hitZone, bool exit, bool stopped);
 
 	void createDrawOrderList();

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- sfuncs.cpp	8 Oct 2005 15:20:11 -0000	1.172
+++ sfuncs.cpp	9 Oct 2005 01:43:08 -0000	1.173
@@ -1108,6 +1108,9 @@
 	actor->_location.y = actorLocation.y;
 	actor->_facingDirection = actor->_actionDirection = actorDirection;
 
+	if (!actor->_frames)
+		_vm->_actor->loadActorResources(actor);
+
 	if (frameType >= 0) {
 		frameRange = _vm->_actor->getActorFrameRange(actorId, frameType);