Merge remote-tracking branch 'origin/main' into work

Author: mattbruv

.DS_Store

@@ -2,7 +2,7 @@ name: Build
 
 on:
   push:
-  pull_request:
+  pull_request_target:
 
 jobs:
   build:
@@ -144,7 +144,7 @@ jobs:
     needs:
       - build
       - build-previous
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && github.event_name != 'pull_request_target'
     steps:
       - name: Checkout website code
         uses: actions/checkout@v4

.github/workflows/build.yml

@@ -13,6 +13,7 @@
 #include "iModel.h"
 #include "xSnd.h"
 #include "xCollide.h"
+#include "zNPCTypes.h"
 #include <cstring>
 #include <stdio.h>
 
@@ -855,11 +856,11 @@ S32 zParamGetVector(xModelAssetParam* param, U32 size, char* tok, xVec3 vec1, xV
 
 // clang-format off
 _ShadowParams gShadowParams[] = {
-    {'NTR0', 0.33f, 2.0f},
-    {'NTR3', 0.0f, 1.25f},
-    {'NTFA', -0.25f, 0.75f},
-    {'NTR5', 0.5f, 1.0f},
-    {'NTB0', 1.0f, 2.0f},
+    {NPC_TYPE_HAMMER, 0.33f, 2.0f},
+    {NPC_TYPE_GLOVE, 0.0f, 1.25f},
+    {NPC_TYPE_PLANKNPC, -0.25f, 0.75f},
+    {NPC_TYPE_SLEEPY, 0.5f, 1.0f},
+    {NPC_TYPE_BOSSSANDY, 1.0f, 2.0f},
 };
 // clang-format on
 

src/SB/Game/zEnt.cpp

@@ -3686,9 +3686,9 @@ static void load_player_ini()
 void zEntPlayer_RestoreSounds()
 {
     sPlayerIgnoreSound--;
-    if (sPlayerIgnoreSound < 0) 
-	{
-		sPlayerIgnoreSound = 0;
+    if (sPlayerIgnoreSound < 0)
+    {
+        sPlayerIgnoreSound = 0;
     }
 }
 
@@ -3706,12 +3706,12 @@ void zEntPlayerUpdateModelSB();
 
 void zEntPlayerUpdateModel()
 {
-	zPlayerGlobals* pg = &globals.player;
-	
-	if (pg->ent.model == pg->model_spongebob)
-	{
-	    zEntPlayerUpdateModelSB();
-	}
+    zPlayerGlobals* pg = &globals.player;
+
+    if (pg->ent.model == pg->model_spongebob)
+    {
+        zEntPlayerUpdateModelSB();
+    }
 }
 
 S32 zEntPlayer_Damage(xBase* src, U32 damage, const xVec3* knockback)

src/SB/Game/zEntPlayer.cpp

@@ -1257,22 +1257,20 @@ S32 zNPCGoalAttackTarTar::Enter(F32 dt, void* updCtxt)
 
 S32 zNPCGoalAttackChomper::Enter(F32 dt, void* updCtxt)
 {
-    zNPCCommon* com = ((zNPCCommon*)(psyche->clt_owner));
-    com->VelStop();
-    com->SndPlayRandom(NPC_STYP_ATTACK);
+    zNPCCommon* npc = ((zNPCCommon*)(psyche->clt_owner));
+    npc->VelStop();
+    npc->SndPlayRandom(NPC_STYP_ATTACK);
 
     return zNPCGoalPushAnim::Enter(dt, updCtxt);
 }
 
 S32 zNPCGoalEvilPat::Enter(F32 dt, void* updCtxt)
 {
-    zNPCCommon* com = ((zNPCCommon*)(psyche->clt_owner));
-
-    S32 typ = com->SelfType();
+    zNPCCommon* npc = ((zNPCCommon*)(psyche->clt_owner));
 
-    if ((typ - 'NT\0\0') == 'R3')
+    if (npc->SelfType() == NPC_TYPE_GLOVE)
     {
-        com->flg_vuln |= 0x80000000;
+        npc->flg_vuln |= 0x80000000;
     }
 
     GlyphStart();
@@ -1282,16 +1280,14 @@ S32 zNPCGoalEvilPat::Enter(F32 dt, void* updCtxt)
 
 S32 zNPCGoalEvilPat::Exit(F32 dt, void* updCtxt)
 {
-    zNPCCommon* com = ((zNPCCommon*)(psyche->clt_owner));
-
-    S32 typ = com->SelfType();
+    zNPCCommon* npc = ((zNPCCommon*)(psyche->clt_owner));
 
-    if ((typ - 'NT\0\0') == 'R3')
+    if (npc->SelfType() == NPC_TYPE_GLOVE)
     {
-        com->flg_vuln &= 0x7FFFFFFF;
+        npc->flg_vuln &= 0x7FFFFFFF;
     }
 
-    *(F32*)(&com->snd_queue[6].flg_snd) = -1.0f;
+    *(F32*)(&npc->snd_queue[6].flg_snd) = -1.0f;
 
     GlyphStop();
 

src/SB/Game/zNPCGoalRobo.cpp

@@ -10,23 +10,26 @@ void zNPCMsg_Startup();
 void zNPCMsg_Shutdown();
 void zNPCMsg_AreaNotify(zNPCCommon* sender, en_NPC_MSG_ID msgid, F32 rad, S32 filter,
                         en_NPCTYPES toNPCType);
+void zNPCMsg_Timestep(xScene* xscn, F32 dt);
 
-struct NPCPSClt {
+struct NPCPSClt
+{
     // total size: 0x10
-    void (* notify)(void *, class NPCMsg *); // offset 0x0, size 0x4
-    void * notedata; // offset 0x4, size 0x4
+    void (*notify)(void*, NPCMsg*); // offset 0x0, size 0x4
+    void* notedata; // offset 0x4, size 0x4
     signed int flg_filter; // offset 0x8, size 0x4
-    class NPCPSClt * next; // offset 0xC, size 0x4
+    NPCPSClt* next; // offset 0xC, size 0x4
 };
 
-struct NPCPSData {
+struct NPCPSData
+{
     // total size: 0x30
-     NPCPSClt * cltblob; // offset 0x0, size 0x4
-     NPCPSClt * cltfree; // offset 0x4, size 0x4
-     st_XORDEREDARRAY cltlist; // offset 0x8, size 0x10
-     NPCMsg * msgblob; // offset 0x18, size 0x4
-     NPCMsg * msgfree; // offset 0x1C, size 0x4
-     st_XORDEREDARRAY quelist; // offset 0x20, size 0x10
+    NPCPSClt* cltblob; // offset 0x0, size 0x4
+    NPCPSClt* cltfree; // offset 0x4, size 0x4
+    st_XORDEREDARRAY cltlist; // offset 0x8, size 0x10
+    NPCMsg* msgblob; // offset 0x18, size 0x4
+    NPCMsg* msgfree; // offset 0x1C, size 0x4
+    st_XORDEREDARRAY quelist; // offset 0x20, size 0x10
 };
 
 #endif

src/SB/Game/zNPCMessenger.h

@@ -11,11 +11,13 @@
 #include "zNPCSpawner.h"
 #include "zNPCMessenger.h"
 #include "zNPCGoals.h"
+#include "zNPCTypeTiki.h"
 #include "zGlobals.h"
 #include "xFactory.h"
 #include "zRenderState.h"
 
 #include "xBehaveMgr.h"
+#include "xstransvc.h"
 
 #include <types.h>
 
@@ -303,7 +305,7 @@ void zNPCCommon::RenderExtraPostParticles()
 void zNPCMgr::ScenePostRender()
 {
     xLightKit_Enable(globals.player.ent.lightKit, globals.currWorld);
-    enum _SDRenderState old_rendstat = zRenderStateCurrent();
+    _SDRenderState old_rendstat = zRenderStateCurrent();
     zRenderState(SDRS_NPCVisual);
     for (int i = 0; i < npclist.cnt; i++)
     {
@@ -330,3 +332,118 @@ void zNPCMgr::ScenePostRender()
     xLightKit_Enable(0, globals.currWorld);
     zRenderState(old_rendstat);
 }
+
+void zNPCMgr::ScenePostParticleRender()
+{
+    xLightKit_Enable(globals.player.ent.lightKit, globals.currWorld);
+    _SDRenderState old_rendstat = zRenderStateCurrent();
+    zRenderState(SDRS_NPCVisual);
+    for (int i = 0; i < npclist.cnt; i++)
+    {
+        zNPCCommon* npc = (zNPCCommon*)npclist.list[i];
+        if (npc->flg_xtrarend & 0x2)
+        {
+            npc->flg_xtrarend &= ~0x2;
+        }
+        else
+        {
+            continue;
+        }
+
+        if (npc->baseFlags & 0x40)
+        {
+            continue;
+        }
+
+        if (npc->model == NULL || !(npc->model->Flags & 0x400))
+        {
+            npc->RenderExtraPostParticles();
+        }
+    }
+    xLightKit_Enable(0, globals.currWorld);
+    zRenderState(old_rendstat);
+}
+
+void zNPCMgr::SceneTimestep(xScene* xscn, F32 dt)
+{
+    DBG_PerfTrack();
+    if (g_firstFrameUpdateAllNPC != 0)
+    {
+        BackdoorUpdateAllNPCsOnce(xscn, dt);
+        g_firstFrameUpdateAllNPC = 0;
+    }
+    zNPCMsg_Timestep(xscn, dt);
+    zNPCTiki_Timestep(xscn, dt);
+    zNPCCommon_Timestep(xscn, dt);
+    zNPCRobot_Timestep(xscn, dt);
+    zNPCVillager_SceneTimestep(xscn, dt);
+}
+
+void zNPCMgr::BackdoorUpdateAllNPCsOnce(xScene* xscn, F32 dt)
+{
+    for (int i = 0; i < npclist.cnt; i++)
+    {
+        zNPCCommon* npc = (zNPCCommon*)npclist.list[i];
+        xSceneID2Name(globals.sceneCur, npc->id);
+
+        if (npc->baseFlags & 0x40 && npc->update != NULL)
+        {
+            npc->update(npc, xscn, 1.0f / 60);
+        }
+    }
+}
+
+en_NPCTYPES zNPCMgr::NPCTypeForModel(U32 brainID, U32 mdl_hash)
+{
+    if (brainID != NULL)
+    {
+        for (int i = 0; i < sizeof(g_brainTable) / sizeof(g_brainTable[0]); i++)
+        {
+            if (brainID == g_brainTable[i].id)
+            {
+                return g_brainTable[i].type;
+            }
+        }
+    }
+
+    en_NPCTYPES usetype = NPC_TYPE_UNKNOWN;
+    for (NPCMTypeTable* rec = g_tbltype; rec->useNPCType != NPC_TYPE_UNKNOWN; rec++)
+    {
+        if (rec->hashOfName == mdl_hash)
+        {
+            usetype = rec->useNPCType;
+            break;
+        }
+    }
+
+    if (usetype == NPC_TYPE_UNKNOWN)
+    {
+        usetype = NPC_TYPE_COMMON;
+    }
+
+    return usetype;
+}
+
+xEnt* zNPCMgr::CreateNPC(xEntAsset* asset)
+{
+    zNPCCommon* npc;
+    en_NPCTYPES nt;
+    U32 size;
+    xModelAssetInfo* modelAsset = (xModelAssetInfo*)xSTFindAsset(asset->modelInfoID, &size);
+
+    // FIXME: Replace with actually getting the right model hash from the packed data
+    nt = this->NPCTypeForModel(modelAsset->BrainID, *(&asset->modelInfoID + 3));
+    npc = (zNPCCommon*)npcFactory->CreateItem(nt, NULL, NULL);
+
+    npc->Init(asset);
+    XOrdAppend(&npclist, npc);
+
+    if (npclist.cnt == npclist.max)
+    {
+        XOrdSort(&npclist, zNPCMgr_OrdComp_npcid);
+    }
+
+    this->DBG_Reset();
+
+    return npc;
+}

src/SB/Game/zNPCMgr.cpp

@@ -3,6 +3,7 @@
 
 #include "xFactory.h"
 #include "xBehaveMgr.h"
+#include "zNPCTypes.h"
 
 #include <types.h>
 
@@ -14,7 +15,7 @@ struct zNPCMgr : RyzMemData
     xBase selfbase;
 
     zNPCMgr();
-    S32 NPCTypeForModel(U32, U32);
+    enum en_NPCTYPES NPCTypeForModel(U32 brainID, U32 mdl_hash);
     void BackdoorUpdateAllNPCsOnce(xScene*, F32);
     void PrepTypeTable();
     void Startup();

src/SB/Game/zNPCMgr.h

@@ -640,6 +640,7 @@ void zNPCCommon_WonderReset();
 void ZNPC_Common_Shutdown();
 void NPCC_BuildStandardAnimTran(xAnimTable* table, char** namelist, S32* ourAnims, S32 idx_dflt,
                                 F32 blend);
+void zNPCCommon_Timestep(xScene* xscn, F32 dt);
 
 xAnimTable* ZNPC_AnimTable_Common();
 xAnimTable* ZNPC_AnimTable_LassoGuide();