OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed some issues with setup parts for ZScript in the wrong place.

Browse source 
This never showed on GZDoom as an error but on Raze which has no actor classes it caused incompletely set up class descriptors.
This commit is contained in:
Christoph Oelckers 2020-06-14 17:22:56 +02:00
commit 75cd00a340
13 changed files with 74 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/scripting/vmthunks.cpp
View file

@ -1607,22 +1607,6 @@ DEFINE_ACTION_FUNCTION_NATIVE(FLevelLocals, ReplaceTextures, ReplaceTextures)
return 0;
}
static int CheckForTexture(const FString& name, int type, int flags)
{
return TexMan.CheckForTexture(name, static_cast<ETextureType>(type), flags).GetIndex();
}
DEFINE_ACTION_FUNCTION_NATIVE(_TexMan, CheckForTexture, CheckForTexture)
{
PARAM_PROLOGUE;
PARAM_STRING(name);
PARAM_INT(type);
PARAM_INT(flags);
ACTION_RETURN_INT(CheckForTexture(name, type, flags));
}
//=====================================================================================
//
// secplane_t exports
@ -2920,12 +2904,6 @@ DEFINE_FIELD(DHUDFont, mFont);
DEFINE_GLOBAL(StatusBar);
DEFINE_GLOBAL(Bindings)
DEFINE_GLOBAL(AutomapBindings)
DEFINE_GLOBAL_NAMED(mus_playing, musplaying);
DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, name);
DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, baseorder);
DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, loop);
DEFINE_GLOBAL(generic_ui)

2
src/scripting/zscript/zcc_compile_doom.cpp
View file

@ -648,7 +648,7 @@ void ZCCDoomCompiler::InitDefaults()
if (c->Defaults.Size()) Error(c->cls, "%s: Non-actor classes may not have defaults", c->ClassType()->TypeName.GetChars());
if (c->ClassType()->ParentClass)
{
auto ti = static_cast<PClassActor *>(c->ClassType());
auto ti = c->ClassType();
ti->InitializeDefaults();
}
}

2
src/scripting/zscript/zcc_compile_doom.h
View file

@ -24,7 +24,7 @@ private:
void DispatchScriptProperty(PProperty *prop, ZCC_PropertyStmt *property, AActor *defaults, Baggage &bag);
void ProcessDefaultProperty(PClassActor *cls, ZCC_PropertyStmt *prop, Baggage &bag);
void ProcessDefaultFlag(PClassActor *cls, ZCC_FlagStmt *flg);
void InitDefaults();
void InitDefaults() override final;
FxExpression *SetupActionFunction(PClass *cls, ZCC_TreeNode *af, int StateFlags);
void CompileStates();
int CheckActionKeyword(ZCC_FuncDeclarator *f, uint32_t &varflags, int useflags, ZCC_StructWork *c);