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

parse the states into an array.

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-18 19:01:40 +02:00
parent 6725867462
commit fc9ce29788
4 changed files with 63 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/core/actorinfo.h
View file

@ -19,6 +19,7 @@ enum EDefaultFlags
DEFF_SCALE = 4,
};
struct FActorInfo
{
TArray<FInternalLightAssociation *> LightAssociations;

22
source/core/thingdef_properties.cpp
View file

@ -392,25 +392,3 @@ DEFINE_PROPERTY(precacheclass, Sssssssssssssssssssssssssssssss, CoreActor)
info->ActorInfo()-> precacheClasses.Push(cls);
}
}
// hopefully this can later be integrated into the state block and made usable for all games.
// for now we need something that can be made to work quickly without messing around with the parser.
DEFINE_PROPERTY(aistate, SSIIGGGGs, CoreActor)
{
PROP_STRING_PARM(label, 0);
PROP_STRING_PARM(seq, 1); // either a sequence name or an Id as '#123'.
PROP_INT_PARM(type, 2);
PROP_INT_PARM(duration, 3);
PROP_FUNC_PARM(action, 4);
PROP_FUNC_PARM(enter, 5);
PROP_FUNC_PARM(tick, 6);
PROP_FUNC_PARM(move, 7);
const char* next = nullptr;
if (PROP_PARM_COUNT > 8)
{
PROP_STRING_PARM(_next, 8);
next = _next;
}
}

12
source/games/blood/src/ai.h
View file

@ -29,6 +29,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_BLD_NS
struct AISTATES {
int stateType; // By NoOne: current type of state. Basically required for kModernDudeTargetChanger, but can be used for something else.
int seqId;
int stateTicks;
FName name;
VMFunction* funcId;
VMFunction* enterFunc;
VMFunction* moveFunc;
VMFunction* thinkFunc;
AISTATES* nextState;
};
struct AISTATE {
int stateType; // By NoOne: current type of state. Basically required for kModernDudeTargetChanger, but can be used for something else.
int seqId;

50
source/games/blood/src/blood.cpp
View file

@ -703,6 +703,8 @@ void GameInterface::FreeLevelData()
return new GameInterface;
}
void FixStates();
void GameInterface::FinalizeSetup()
{
// assign spawn types to actor classes. Some code will need them.
@ -718,6 +720,7 @@ void GameInterface::FinalizeSetup()
actorinfo->TypeNum = pair->Key;
}
}
FixStates();
}
//---------------------------------------------------------------------------
@ -781,4 +784,51 @@ DEFINE_PROPERTY(dmgcontrol, IIIIIII, BloodActor)
}
}
// this is rather makeshift for now, it needs to be cleaned up once the native states are gone.
// it only supports the minimum needed set of features to allow getting rid of them and takes all available shortcuts.
TArray<AISTATES> allStates;
DEFINE_PROPERTY(aistate, SSIIGGGGs, BloodActor)
{
PROP_STRING_PARM(label, 0);
PROP_STRING_PARM(seq, 1); // either a sequence name or an Id as '#123'.
PROP_INT_PARM(type, 2);
PROP_INT_PARM(duration, 3);
PROP_FUNC_PARM(action, 4);
PROP_FUNC_PARM(enter, 5);
PROP_FUNC_PARM(move, 6);
PROP_FUNC_PARM(tick, 7);
const char* next = nullptr;
if (PROP_PARM_COUNT > 8)
{
PROP_STRING_PARM(_next, 8);
next = _next;
}
int seqno = (int)strtol(seq + 1, nullptr, 10); // skip the '+', this needs to be done better later.
AISTATES state = { type, seqno, duration, FName(label), action, enter, move, tick, (AISTATES*)(intptr_t)(FName(next).GetIndex()) };
allStates.Push(state);
}
AISTATES* FindState(FName name)
{
int index = name.GetIndex() - NAME_genIdle;
if (index < allStates.SSize()) return &allStates[index];
I_Error("bad state %s requested\n", name.GetChars());
}
void FixStates()
{
for (auto& state : allStates)
{
if (state.nextState)
{
FName offset = (ENamedName)(intptr_t)state.nextState;
state.nextState = FindState(offset);
assert(state.nextState->name == offset);
}
}
}
END_BLD_NS