[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.30,1.31
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Tue Oct 26 00:03:05 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actordata.cpp,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.16,1.17 interface.cpp,1.30,1.31 interface.h,1.11,1.12 script.cpp,1.25,1.26 script.h,1.21,1.22 sfuncs.cpp,1.28,1.29 sthread.cpp,1.32,1.33 xref.txt,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24992
Modified Files:
actor.cpp
Log Message:
Better test for if it's the protagonist who leaves the scene.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- actor.cpp 21 Oct 2004 06:49:11 -0000 1.30
+++ actor.cpp 26 Oct 2004 07:02:32 -0000 1.31
@@ -356,6 +356,7 @@
}
}
+ actor->flags = ActorTable[i].flags;
actor->a_dcolor = ActorTable[i].color;
actor->orient = ACTOR_DEFAULT_ORIENT;
actor->a_intentlist = ys_dll_create();
@@ -928,9 +929,7 @@
endpoint.x = (int)new_a_x / R_ACTOR_LMULT;
endpoint.y = (int)new_a_y / R_ACTOR_LMULT;
if ((exitNum = _vm->_scene->_actionMap->hitTest(endpoint)) != -1) {
- // WORKAROUND: Only change room if the actor is Rif
- // himself. We need to fix this properly later.
- if (actor->id == 0)
+ if (actor->flags & kProtagonist)
_vm->_scene->changeScene(_vm->_scene->_actionMap->getExitScene(exitNum));
}
*complete_p = 1;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actordata.cpp,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.16,1.17 interface.cpp,1.30,1.31 interface.h,1.11,1.12 script.cpp,1.25,1.26 script.h,1.21,1.22 sfuncs.cpp,1.28,1.29 sthread.cpp,1.32,1.33 xref.txt,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list