zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-23 00:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

#ifdef some nnext stuff

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-08 13:37:45 +02:00
parent 2d37705921
commit 71e8757a81
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/core/zcc_compile_raze.cpp
View file

@ -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<PClassActor*>(c->ClassType())->ActorInfo()->AIStates.Reset();
for (auto s : c->States)
{

2
source/games/blood/src/actor.cpp
View file

@ -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);

2
source/games/blood/src/bloodactor.h
View file

@ -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)
{