[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.343,1.344 charset.cpp,2.137,2.138 costume.cpp,1.179,1.180 cursor.cpp,2.35,2.36 gfx.cpp,2.434,2.435 input.cpp,2.24,2.25 object.cpp,1.230,1.231 resource.cpp,1.317,1.318 resource_v2.cpp,1.52,1.53 resource_v4.cpp,1.24,1.25 room.cpp,1.6,1.7 saveload.cpp,1.205,1.206 script.cpp,1.216,1.217 script_v2.cpp,2.273,2.274 script_v5.cpp,1.283,1.284 script_v6.cpp,1.434,1.435 script_v6he.cpp,2.155,2.156 scumm.cpp,1.445,1.446 scumm.h,1.591,1.592 sound.cpp,1.445,1.446 string.cpp,1.278,1.279 vars.cpp,1.123,1.124 verbs.cpp,1.128,1.129
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.435,2.436 input.cpp,2.25,2.26 scumm.cpp,1.446,1.447 scumm.h,1.592,1.593
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.343,1.344 charset.cpp,2.137,2.138 costume.cpp,1.179,1.180 cursor.cpp,2.35,2.36 gfx.cpp,2.434,2.435 input.cpp,2.24,2.25 object.cpp,1.230,1.231 resource.cpp,1.317,1.318 resource_v2.cpp,1.52,1.53 resource_v4.cpp,1.24,1.25 room.cpp,1.6,1.7 saveload.cpp,1.205,1.206 script.cpp,1.216,1.217 script_v2.cpp,2.273,2.274 script_v5.cpp,1.283,1.284 script_v6.cpp,1.434,1.435 script_v6he.cpp,2.155,2.156 scumm.cpp,1.445,1.446 scumm.h,1.591,1.592 sound.cpp,1.445,1.446 string.cpp,1.278,1.279 vars.cpp,1.123,1.124 verbs.cpp,1.128,1.129
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.435,2.436 input.cpp,2.25,2.26 scumm.cpp,1.446,1.447 scumm.h,1.592,1.593
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list