[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.116,1.117 scene.cpp,1.95,1.96

Andrew Kurushin h00ligan at users.sourceforge.net
Wed Apr 20 12:38:39 CEST 2005


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

Modified Files:
	actor.cpp scene.cpp 
Log Message:
fixed actors bug after all demo passed

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- actor.cpp	19 Apr 2005 11:07:06 -0000	1.116
+++ actor.cpp	20 Apr 2005 19:38:02 -0000	1.117
@@ -597,6 +597,8 @@
 			_protagonist->location.z = sceneEntry->location.z * ACTOR_LMULT;
 		}
 		_protagonist->facingDirection = _protagonist->actionDirection = sceneEntry->facing;
+	} else {
+		warning("actorsEntrance < 0");
 	}
 
 	_protagonist->currentAction = kActionWait;

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- scene.cpp	2 Apr 2005 20:04:38 -0000	1.95
+++ scene.cpp	20 Apr 2005 19:38:04 -0000	1.96
@@ -190,7 +190,7 @@
 	scene_qdat = queueIterator.operator->();
 	assert(scene_qdat != NULL);
 
-	loadScene(scene_qdat->scene_n, scene_qdat->load_flag, scene_qdat->scene_proc, scene_qdat->sceneDescription, scene_qdat->fadeType, -1);
+	loadScene(scene_qdat->scene_n, scene_qdat->load_flag, scene_qdat->scene_proc, scene_qdat->sceneDescription, scene_qdat->fadeType, 0);
 
 	return SUCCESS;
 }
@@ -229,7 +229,7 @@
 	scene_qdat = queueIterator.operator->();
 	assert(scene_qdat != NULL);
 
-	loadScene(scene_qdat->scene_n, scene_qdat->load_flag, scene_qdat->scene_proc, scene_qdat->sceneDescription, scene_qdat->fadeType, -1);
+	loadScene(scene_qdat->scene_n, scene_qdat->load_flag, scene_qdat->scene_proc, scene_qdat->sceneDescription, scene_qdat->fadeType, 0);
 
 	return SUCCESS;
 }





More information about the Scummvm-git-logs mailing list