xBehaveMgr work

Author: escape209

src/SB/Core/x/xBehaveMgr.cpp

@@ -209,12 +209,11 @@ void xPsyche::Amnesia(S32 i)
     while (g != NULL)
     {
         xGoal* thisg = g;
-        g = g->Next();
-        // this->goallist = this->goallist->Next();
+        g = thisg->Next();
 
-        if (i == 0 && this->GIDInStack(thisg->GetID()) != NULL)
+        if ((i != 0) || (this->GIDInStack(thisg->GetID()) == 0))
         {
-            continue;
+            thisg->Clear();
         }
     }
 }
@@ -238,3 +237,145 @@ S32 xPsyche::IndexInStack(S32 gid) const
 
     return da_idx;
 }
+
+S32 xPsyche::GoalPopToBase(S32 overpend)
+{
+    if (this->flg_psyche & 4)
+    {
+        return 0;
+	}
+	else if (this->staktop < 1)
+    {
+        return 0;
+    }
+	else
+	{
+		xPsyche::GoalPop(this->goalstak[0]->GetID(), overpend);
+        if ((this->pendtype != PEND_TRAN_NONE) && ((this->flg_psyche & 1)))
+        {
+            this->ForceTran(0.01f, NULL);
+
+        }
+        return 1;
+	}
+}
+
+xGoal* xPsyche::GetCurGoal() const
+{
+    if (this->staktop < 0)
+    {
+        return NULL;
+    }
+    else
+    {
+        return this->goalstak[this->staktop];
+    }
+}
+
+S32 xPsyche::GIDOfActive() const
+{
+    if (this->staktop < 0)
+    {
+        return 0;
+    }
+    else
+    {
+        return this->goalstak[this->staktop]->GetID();
+    }
+}
+
+S32 xPsyche::GIDOfPending() const
+{
+    if (this->pendgoal != 0)
+    {
+        return this->pendgoal->GetID();
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+xGoal* xPsyche::GetPrevRecovery(S32 gid)
+{
+    S32 idx_start = -1;
+    S32 i;
+    xGoal* recgoal = NULL;
+	xGoal* tmpgoal = NULL;
+
+    if (gid == 0)
+    {
+        for (idx_start = this->staktop; idx_start >= 0; idx_start--)
+        {
+            tmpgoal = this->goalstak[idx_start];
+            if (tmpgoal->GetFlags() & 8)
+            {
+                recgoal = tmpgoal;
+				break;
+            }
+        }
+    }
+    else
+    {
+        for (i = this->staktop; i >= 0; i--)
+        {
+            if (gid == this->goalstak[i]->GetID())
+            {
+                idx_start = i - 1;
+                break;
+            }
+        }
+        if (idx_start > 0)
+        {
+            for (int i = idx_start; i >= 0; i--)
+            {
+                tmpgoal = this->goalstak[i];
+                if (tmpgoal->GetFlags() & 8)
+                {
+                    recgoal = tmpgoal;
+					break;
+                }
+            }
+        }
+    }
+    return recgoal;
+}
+
+void xPsyche::SetTopState(en_GOALSTATE state)
+{
+    if (this->staktop >= 0)
+    {
+        this->goalstak[this->staktop]->SetState(state);
+    }
+}
+
+F32 xPsyche::TimerGet(en_xpsytime tymr)
+{
+    if (this->staktop < 0)
+    {
+        return -1.0f;
+    }
+	return *(&this->tmr_stack[0][this->staktop] + tymr); // ...what?
+}
+
+void xPsyche::TimerClear()
+{
+    if (this->staktop < 0)
+    {
+        return;
+    }
+	// Missing unreachable branch here. Otherwise functionally identical.
+	this->tmr_stack[0][this->staktop] = 0.0f;
+}
+
+void xPsyche::TimerUpdate(F32 dt)
+{
+    F32* p;
+    if (this->staktop < 0)
+    {
+		return;
+    }
+
+	p = &this->tmr_stack[0][this->staktop];
+	*p += dt;
+}

src/SB/Core/x/xBehaviour.h

@@ -67,6 +67,12 @@ enum en_psynote
     PSY_NOTE_FORCE = 0x7fffffff
 };
 
+enum en_xpsytime
+{
+    XPSY_TYMR_CURGOAL = 0,
+    XPSY_TYMR_NOMORE = 1,
+};
+
 struct xGoal;
 
 struct xPSYNote
@@ -110,6 +116,7 @@ struct xPsyche : RyzMemData
     {
         return gid_safegoal;
     }
+	xGoal* GetPrevRecovery(S32 gid);
     S32 Timestep(F32 dt, void* updCtxt);
     xGoal* FindGoal(S32 gid);
     S32 GoalSet(S32 gid, S32 r5);
@@ -125,10 +132,15 @@ struct xPsyche : RyzMemData
     void BrainExtend();
     void BrainEnd();
     xGoal* AddGoal(S32 gid, void* createData);
+	void ForceTran(F32, void*);
     void FreshWipe();
+	F32 TimerGet(en_xpsytime tymr);
+	void TimerClear();
+	void SetTopState(en_GOALSTATE);
     void SetOwner(xBase*, void*);
     void KillBrain(xFactory*);
     void Lobotomy(xFactory*);
+	void TimerUpdate(F32 dt);
     void SetSafety(S32 goalID)
     {
         gid_safegoal = goalID;