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

Merge pull request #454 from ZippeyKeys12/master

Browse source 
Default newradius in A_SetSize
This commit is contained in:
Christoph Oelckers 2018-03-31 08:55:12 +02:00 committed by GitHub
commit fb263a0fe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_actionfunctions.cpp
View file

@ -6765,7 +6765,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_CheckTerrain)
DEFINE_ACTION_FUNCTION(AActor, A_SetSize) DEFINE_ACTION_FUNCTION(AActor, A_SetSize)
{ {
PARAM_SELF_PROLOGUE(AActor); PARAM_SELF_PROLOGUE(AActor);
PARAM_FLOAT(newradius); PARAM_FLOAT_DEF(newradius);
PARAM_FLOAT_DEF(newheight); PARAM_FLOAT_DEF(newheight);
PARAM_BOOL_DEF(testpos); PARAM_BOOL_DEF(testpos);

2
wadsrc/static/zscript/actor.txt
View file

@ -1145,7 +1145,7 @@ class Actor : Thinker native
native bool A_CopySpriteFrame(int from, int to, int flags = 0); native bool A_CopySpriteFrame(int from, int to, int flags = 0);
native bool A_SetVisibleRotation(double anglestart = 0, double angleend = 0, double pitchstart = 0, double pitchend = 0, int flags = 0, int ptr = AAPTR_DEFAULT); native bool A_SetVisibleRotation(double anglestart = 0, double angleend = 0, double pitchstart = 0, double pitchend = 0, int flags = 0, int ptr = AAPTR_DEFAULT);
native void A_SetTranslation(name transname); native void A_SetTranslation(name transname);
native bool A_SetSize(double newradius, double newheight = -1, bool testpos = false); native bool A_SetSize(double newradius = -1, double newheight = -1, bool testpos = false);
native void A_SprayDecal(String name, double dist = 172); native void A_SprayDecal(String name, double dist = 172);
native void A_SetMugshotState(String name); native void A_SetMugshotState(String name);