zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix it

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-05 17:41:25 +01:00
parent eb282c0d11
commit 148d75251f
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_effect.cpp
View file

@ -567,16 +567,6 @@ void P_DrawSplash (int count, const DVector3 &pos, DAngle angle, int kind)
}
}
DEFINE_ACTION_FUNCTION(AActor, DrawSplash)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_INT(count);
PARAM_FLOAT(angle);
PARAM_INT(kind);
P_DrawSplash(count, self->Pos(), angle, kind);
return 0;
}
void P_DrawSplash2 (int count, const DVector3 &pos, DAngle angle, int updown, int kind)
{
int color1, color2, zadd;

4
src/scripting/vmthunks_actors.cpp
View file

@ -532,12 +532,12 @@ DEFINE_ACTION_FUNCTION_NATIVE(AActor, Vec3Offset, Vec3Offset)
ACTION_RETURN_VEC3(self->Vec3Offset(x, y, z, absolute));
}
static void PosRelative(AActor *self, sector_t *sec, DVector3 *result)
static void ZS_PosRelative(AActor *self, sector_t *sec, DVector3 *result)
{
*result = self->PosRelative(sec);
}
DEFINE_ACTION_FUNCTION_NATIVE(AActor, PosRelative, PosRelative)
DEFINE_ACTION_FUNCTION_NATIVE(AActor, PosRelative, ZS_PosRelative)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_POINTER(sec, sector_t);