zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-03 06:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handle cases of empty state labels in ZScript.

Browse source 
Sadly this cannot print a full error message because it got no context for it when it is detected.
This commit is contained in:
Christoph Oelckers 2022-04-15 22:24:34 +02:00
parent 3724f8a67c
commit e7f78ce911
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/playsim/p_map.cpp
View file

@ -4767,10 +4767,7 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
PClassActor *type = PClass::FindActor(pufftype); PClassActor *type = PClass::FindActor(pufftype);
if (type == NULL) if (type == NULL)
{ {
if (victim != NULL) if (victim != NULL) *victim = {};
{
memset(victim, 0, sizeof(*victim));
}
Printf("Attempt to spawn unknown actor type '%s'\n", pufftype.GetChars()); Printf("Attempt to spawn unknown actor type '%s'\n", pufftype.GetChars());
return NULL; return NULL;
} }

6
src/scripting/thingdef.cpp
View file

@ -318,6 +318,12 @@ static void CheckLabel(PClassActor *obj, FStateLabel *slb, int useflag, FName st
auto state = slb->State; auto state = slb->State;
if (state != nullptr) if (state != nullptr)
{ {
if (intptr_t(state) <= 0xffff)
{
// can't do much here aside from printing a message and aborting.
I_Error("Bad state label %s in actor %s", slb->Label.GetChars(), obj->TypeName.GetChars());
}
if (!(state->UseFlags & useflag)) if (!(state->UseFlags & useflag))
{ {
GetStateSource(state).Message(MSG_ERROR, TEXTCOLOR_RED "%s references state %s as %s state, but this state is not flagged for use as %s.\n", GetStateSource(state).Message(MSG_ERROR, TEXTCOLOR_RED "%s references state %s as %s state, but this state is not flagged for use as %s.\n",