OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch '4.14' of c:/projects/gzdoom into gzd4-14-merge

Browse source
This commit is contained in:
Rachael Alexanderson 2024-12-18 10:22:51 -05:00
commit b85b7c18da
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
38 changed files with 386 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/scripting/thingdef.cpp
View file

@ -65,6 +65,7 @@ static TMap<FState *, FScriptPosition> StateSourceLines;
static FScriptPosition unknownstatesource("unknown file", 0);
EXTERN_CVAR(Bool, strictdecorate);
EXTERN_CVAR(Bool, warningstoerrors);
//==========================================================================
//
@ -464,8 +465,27 @@ void LoadActors()
if (FScriptPosition::ErrorCounter > 0)
{
I_Error("%d errors while parsing DECORATE scripts", FScriptPosition::ErrorCounter);
if (FScriptPosition::WarnCounter > 0)
{
I_Error("%d errors, %d warnings while parsing scripts", FScriptPosition::ErrorCounter, FScriptPosition::WarnCounter);
}
else
{
I_Error("%d errors while parsing scripts", FScriptPosition::ErrorCounter);
}
}
else if (FScriptPosition::WarnCounter > 0)
{
if(warningstoerrors)
{
I_Error("%d warnings while parsing scripts\n", FScriptPosition::WarnCounter);
}
else
{
Printf(TEXTCOLOR_ORANGE "%d warnings while parsing scripts\n", FScriptPosition::WarnCounter);
}
}
FScriptPosition::ResetErrorCounter();
// AllActorClasses hasn'T been set up yet.
for (int i = PClass::AllClasses.Size() - 1; i >= 0; i--)

3
src/scripting/vmthunks_actors.cpp
View file

@ -1851,8 +1851,9 @@ DEFINE_ACTION_FUNCTION(AActor, BouncePlane)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_POINTER(plane, secplane_t);
PARAM_BOOL(is3DFloor);
ACTION_RETURN_BOOL(self->FloorBounceMissile(*plane));
ACTION_RETURN_BOOL(self->FloorBounceMissile(*plane, is3DFloor));
}
DEFINE_ACTION_FUNCTION(AActor, PlayBounceSound)