Skip to content

Commit cc41942

Browse files
authored
Match zNPCMgr (#682)
1 parent 1e47ce4 commit cc41942

File tree

6 files changed

+468
-156
lines changed

6 files changed

+468
-156
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ def MatchingFor(*versions):
551551
Object(NonMatching, "SB/Game/zNPCGoalRobo.cpp", extra_cflags=["-sym on"]),
552552
Object(Matching, "SB/Game/zNPCGoalTiki.cpp", extra_cflags=["-sym on"]),
553553
Object(NonMatching, "SB/Game/zNPCMessenger.cpp"),
554-
Object(NonMatching, "SB/Game/zNPCMgr.cpp"),
554+
Object(NonMatching, "SB/Game/zNPCMgr.cpp", extra_cflags=["-sym on"]),
555555
Object(Matching, "SB/Game/zNPCTypes.cpp"),
556556
Object(NonMatching, "SB/Game/zNPCTypeCommon.cpp"),
557557
Object(NonMatching, "SB/Game/zNPCTypeRobot.cpp"),

src/SB/Core/x/xBehaveMgr.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ struct xBehaveMgr : RyzMemData
2727
void ScenePrepare();
2828
void SceneFinish();
2929
void SceneReset();
30-
xFactory* GetFactory();
30+
31+
xFactory* GetFactory()
32+
{
33+
return this->goalFactory;
34+
}
3135
};
3236

3337
void xBehaveMgr_ScenePrepare();

src/SB/Core/x/xNPCBasic.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ struct xNPCBasic : xEnt, xFactoryInst
8585
virtual void Init(xEntAsset* asset);
8686
virtual void PostInit();
8787
virtual void Setup();
88-
virtual void PostSetup();
88+
89+
virtual void PostSetup()
90+
{
91+
}
92+
8993
virtual void Reset();
9094
virtual void Process(xScene* xscn, F32 dt);
9195
virtual void BUpdate(xVec3*);

0 commit comments

Comments
 (0)