From 71e8757a810572ed7c1c0b7eaeab784979cc4d9b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 8 Oct 2023 13:37:45 +0200 Subject: [PATCH] #ifdef some nnext stuff --- source/core/zcc_compile_raze.cpp | 1 + source/games/blood/src/actor.cpp | 2 ++ source/games/blood/src/bloodactor.h | 2 ++ 3 files changed, 5 insertions(+) diff --git a/source/core/zcc_compile_raze.cpp b/source/core/zcc_compile_raze.cpp index e08fb64cc..e08e30ca9 100644 --- a/source/core/zcc_compile_raze.cpp +++ b/source/core/zcc_compile_raze.cpp @@ -1046,6 +1046,7 @@ void ZCCRazeCompiler::CompileStates() statedef.AddStates(&state, "A", defstate.scriptpos); if (defstate.NextStaten != NAME_None) statedef.SetGotoLabel(defstate.NextStaten.GetChars()); } + static_cast(c->ClassType())->ActorInfo()->AIStates.Reset(); for (auto s : c->States) { diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index 727adda8b..3ce104d45 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -3432,7 +3432,9 @@ void MoveDude(DBloodActor* actor) double tz = (actor->spr.pos.Z - top) / 4; double wdf = actor->clipdist; auto pSector = actor->sector(); +#ifdef NOONE_EXTENSIONS int nAiStateType = (actor->xspr.aiState) ? actor->xspr.aiState->Type : -1; +#endif assert(pSector); diff --git a/source/games/blood/src/bloodactor.h b/source/games/blood/src/bloodactor.h index b2a92a4b9..5f3dc2bc1 100644 --- a/source/games/blood/src/bloodactor.h +++ b/source/games/blood/src/bloodactor.h @@ -130,6 +130,7 @@ public: return GetType() >= kItemAmmoBase && GetType() < kItemAmmoMax; } +#ifdef NOONE_EXTENSIONS bool isActive() { if (!hasX()) @@ -147,6 +148,7 @@ public: return true; } } +#endif void ChangeType(PClass* newtype) {