thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAGA2: Fix assignment flag setting

Browse source
This commit is contained in:
a/ 2021-06-25 01:16:22 +09:00 • committed by Eugene Sandulenko
parent f60d4a18fc
commit 51a6baab82
No known key found for this signature in database
GPG key ID: 014D387312D34F08
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/saga2/assign.cpp
View file

@ -35,6 +35,8 @@ namespace Saga2 {
const uint16 indefinitely = CalenderTime::framesPerDay; const uint16 indefinitely = CalenderTime::framesPerDay;
extern Common::Array<char *> nameList;
/* ===================================================================== * /* ===================================================================== *
ActorAssignment member functions ActorAssignment member functions
* ===================================================================== */ * ===================================================================== */
@ -44,7 +46,10 @@ ActorAssignment::ActorAssignment(Actor *a, uint16 until) :
startFrame(calender.frameInDay()), startFrame(calender.frameInDay()),
endFrame(until) { endFrame(until) {
_actor = a; _actor = a;
debugC(2, kDebugActors, "New assignment for %p (%s) from %d until %d: %p",
(void *)a, nameList[a->proto()->nameIndex], startFrame, endFrame, (void *)this);
a->_assignment = this; a->_assignment = this;
a->flags |= hasAssignment;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -60,6 +65,7 @@ ActorAssignment::ActorAssignment(Actor *ac, void **buf) {
_actor = ac; _actor = ac;
ac->_assignment = this; ac->_assignment = this;
a->flags |= hasAssignment;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -67,6 +73,8 @@ ActorAssignment::ActorAssignment(Actor *ac, void **buf) {
ActorAssignment::~ActorAssignment(void) { ActorAssignment::~ActorAssignment(void) {
Actor *a = getActor(); Actor *a = getActor();
debugC(2, kDebugActors, "Ending assignment for %p (%s): %p",
(void *)a, nameList[a->proto()->nameIndex], (void *)this);
// Determine if the actor has a task initiated by this assignment // Determine if the actor has a task initiated by this assignment
if (a->currentGoal == actorGoalFollowAssignment if (a->currentGoal == actorGoalFollowAssignment
@ -76,6 +84,8 @@ ActorAssignment::~ActorAssignment(void) {
delete a->curTask; delete a->curTask;
a->curTask = NULL; a->curTask = NULL;
} }
a->flags &= ~hasAssignment;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

5
engines/saga2/assign.h
View file

@ -50,6 +50,11 @@ enum AssignmentTypes {
* ===================================================================== */ * ===================================================================== */
class ActorAssignment { class ActorAssignment {
enum {
hasAssignment = (1 << 3)
};
uint16 startFrame, // Time in day when this was constructed uint16 startFrame, // Time in day when this was constructed
endFrame; // End time of the assignment endFrame; // End time of the assignment