Skip to content

Commit 95bb444

Browse files
authored
zNPCMessenger work (#693)
* zNPCMessenger work * Fix dependency hell
1 parent e40d9a8 commit 95bb444

File tree

11 files changed

+634
-320
lines changed

11 files changed

+634
-320
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/zNPCGoalStd.cpp", extra_cflags=["-sym on"]),
552552
Object(NonMatching, "SB/Game/zNPCGoalRobo.cpp", extra_cflags=["-sym on"]),
553553
Object(Matching, "SB/Game/zNPCGoalTiki.cpp", extra_cflags=["-sym on"]),
554-
Object(NonMatching, "SB/Game/zNPCMessenger.cpp"),
554+
Object(NonMatching, "SB/Game/zNPCMessenger.cpp", extra_cflags=["-sym on"]),
555555
Object(NonMatching, "SB/Game/zNPCMgr.cpp", extra_cflags=["-sym on"]),
556556
Object(Matching, "SB/Game/zNPCTypes.cpp"),
557557
Object(NonMatching, "SB/Game/zNPCTypeCommon.cpp"),

src/SB/Game/zEntCruiseBubble.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "zEntTrigger.h"
1313
#include "zGameExtras.h"
1414
#include "zGlobals.h"
15+
#include "zGrid.h"
1516
#include "zNPCHazard.h"
1617
#include "zNPCTypeCommon.h"
1718
#include "zPlatform.h"

src/SB/Game/zEntPlayer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "zEntPlayerOOBState.h"
3737
#include "zEntTeleportBox.h"
3838
#include "zGame.h"
39+
#include "zGrid.h"
3940
#include "zGameExtras.h"
4041
#include "zGlobals.h"
4142
#include "zGoo.h"

src/SB/Game/zNPCGoalRobo.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "xMath3.h"
1111
#include "xMathInlines.h"
1212
#include "zNPCGoalRobo.h"
13+
#include "zNPCGoals.h"
1314
#include "zNPCGoalStd.h"
1415
#include "zNPCHazard.h"
1516
#include "zNPCSndLists.h"

0 commit comments

Comments
 (0)