[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.177,1.178 sfuncs.cpp,1.152,1.153
Andrew Kurushin
h00ligan at users.sourceforge.net
Tue Aug 16 11:01:42 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/psp README.PSP,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.135,1.136 itedata.cpp,1.8,1.9 itedata.h,1.7,1.8 saga.cpp,1.129,1.130 saga.h,1.119,1.120 saveload.cpp,1.23,1.24 script.cpp,1.81,1.82
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19091
Modified Files:
actor.cpp sfuncs.cpp
Log Message:
fix 1258781 & 1253993 bugs
(difficulties of leaving scenes)
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- actor.cpp 16 Aug 2005 13:13:27 -0000 1.177
+++ actor.cpp 16 Aug 2005 17:59:49 -0000 1.178
@@ -1901,11 +1901,11 @@
}
}
+ _barrierCount = 0;
if (!(actor->_actorFlags & kActorNoCollide)) {
collision.x = ACTOR_COLLISION_WIDTH * actor->_screenScale / (256 * 2);
collision.y = ACTOR_COLLISION_HEIGHT * actor->_screenScale / (256 * 2);
- _barrierCount = 0;
for (i = 0; (i < _actorsCount) && (_barrierCount < ACTOR_BARRIERS_MAX); i++) {
anotherActor = _actors[i];
Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- sfuncs.cpp 11 Aug 2005 14:00:26 -0000 1.152
+++ sfuncs.cpp 16 Aug 2005 17:59:49 -0000 1.153
@@ -393,7 +393,7 @@
moduleNumber = _vm->_scene->getScriptModuleNumber();
break;
default:
- error("Script::sfScriptDoAction wrong object type");
+ error("Script::sfScriptDoAction wrong object type 0x%X", objectId);
}
event.type = kEvTOneshot;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/psp README.PSP,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.135,1.136 itedata.cpp,1.8,1.9 itedata.h,1.7,1.8 saga.cpp,1.129,1.130 saga.h,1.119,1.120 saveload.cpp,1.23,1.24 script.cpp,1.81,1.82
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list