Merge pull request bfbbdecomp#22 from bluisblu/main

Some xtaskbox and xWad5 work

Author: LivewireCB

src/SB/Core/x/xEvent.h

@@ -563,5 +563,7 @@ void zEntEvent(xBase* from, xBase* to, U32 toEvent);
 void zEntEvent(xBase* from, xBase* to, U32 toEvent, const F32* toParam);
 void zEntEvent(xBase* from, U32 fromEvent, xBase* to, U32 toEvent, const F32* toParam,
                xBase* toParamWidget, S32 forceEvent);
+void zEntEvent(xBase* from, U32 fromEvent, xBase* to, U32 toEvent, const F32* toParam,
+               xBase* toParamWidget, U32 unknown, S32 forceEvent);
 
 #endif

src/SB/Core/x/xWad5.cpp

@@ -1280,6 +1280,13 @@ void xCameraFXShake(F32 maxTime, F32 magnitude, F32 cycleMax, F32 rotate_magnitu
     }
 }
 
+void xCameraFXShakeEnd(cameraFX* fx, F32 fadeOutTime)
+{
+    fx->maxTime = fadeOutTime;
+    fx->elapsedTime = 0.0f;
+    fx->shake.dampenRate = (1.0f / fadeOutTime);
+}
+
 void xCameraFXZoomUpdate(cameraFX* f, F32 dt, const xMat4x3*, xMat4x3* m)
 {
     switch (f->zoom.mode)

src/SB/Game/zTaskBox.cpp

@@ -16,7 +16,7 @@ extern ztaskbox* shared;
 void ztaskbox::load(const asset_type& a)
 {
     xBaseInit((xBase*)this, &(xBaseAsset)a);
-    this->baseType = eBaseTypeEnv;
+    this->baseType = eBaseTypeTaskBox;
     // FIXME: can't force const to non-const?
     // this->asset = &a;
 
@@ -177,7 +177,7 @@ void ztaskbox::complete()
     {
         this->state = STATE_INVALID;
         this->flag.enabled = false;
-        zEntEvent(this, this, eEventTaskBox_OnComplete);
+        zEntEvent(this, 0, this, eEventTaskBox_OnComplete, 0, NULL, 0, 1);
         this->current = (ztaskbox*)zSceneFindObject(this->asset->next_task);
 
         // Bruh
@@ -211,12 +211,60 @@ bool ztaskbox::exists(state_enum stage)
     return state != STATE_BEGIN && xSTFindAsset(state, NULL);
 }
 
+void ztaskbox::set_state(state_enum stage)
+{
+    this->state = stage;
+    this->current = this;
+
+    // todo
+}
+
+void ztaskbox::cb_dispatch(xBase*, xBase* to, U32 event, F32*, xBase*, U32)
+{
+    ztaskbox& taskbox = *(ztaskbox*)to;
+
+    switch (event)
+    {
+    case eEventReset:
+        taskbox.reset();
+        break;
+    case eEventStartConversation:
+        taskbox.start_talk(NULL);
+        break;
+    case eEventEndConversation:
+        taskbox.stop_talk();
+        break;
+    case eEventTaskBox_Initiate:
+        taskbox.initiate();
+        break;
+    case eEventTaskBox_SetSuccess:
+        taskbox.succeed();
+        break;
+    case eEventTaskBox_SetFailure:
+        taskbox.fail();
+        break;
+    case eEventTaskBox_OnAccept:
+    case eEventTaskBox_OnDecline:
+    case eEventTaskBox_OnComplete:
+        break;
+    }
+}
+
 void ztaskbox::talk_callback::on_start()
 {
-    this->task->on_talk_start();
+    this->task->flag.unk_11 = 1;
+    if (this->task->cb != nullptr)
+    {
+        this->task->cb->on_talk_start();
+    }
 }
 
 void ztaskbox::talk_callback::on_stop()
 {
     this->task->on_talk_stop(answer);
 }
+
+void ztaskbox::talk_callback::on_answer(answer_enum answer)
+{
+    this->answer = answer;
+}

src/SB/Game/zTaskBox.h

@@ -16,7 +16,8 @@ struct ztaskbox : xBase
     struct flagData
     {
         U8 enabled : 8;
-        U32 dummy : 24;
+        U8 unk_11 : 8;
+        U16 dummy : 16;
     };
 
     enum state_enum
@@ -33,6 +34,8 @@ struct ztaskbox : xBase
 
     struct callback
     {
+        virtual void on_talk_start();
+        virtual void on_talk_stop();
     };
 
     struct talk_callback : callback
@@ -88,6 +91,7 @@ struct ztaskbox : xBase
     void complete();
     static void init();
     bool exists(state_enum stage);
+    void cb_dispatch(xBase*, xBase* to, U32 event, F32*, xBase*, U32);
 };
 
 #endif