zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make various getter and pure-math Actor methods clearscope.

Browse source 
These methods do not examine or change playsim state. They only perform math or look at class metadata.

Methods changed are:

• deltaangle
• absangle
• AngleToVector
• RotateVector
• Normalize180
• BobSin
• GetDefaultSpeed
• FindState
• GetDropItems (which changes the scope of the returned struct, but the returned struct is all-readonly anyway)
This commit is contained in:
argv-minus-one 2018-08-14 01:14:35 -07:00 committed by Christoph Oelckers
parent 57ed4df85e
commit 0717f5aede
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -407,11 +407,11 @@ class Actor : Thinker native
// Functions
// 'parked' global functions.
native static double deltaangle(double ang1, double ang2);
native static double absangle(double ang1, double ang2);
native static Vector2 AngleToVector(double angle, double length = 1);
native static Vector2 RotateVector(Vector2 vec, double angle);
native static double Normalize180(double ang);
native clearscope static double deltaangle(double ang1, double ang2);
native clearscope static double absangle(double ang1, double ang2);
native clearscope static Vector2 AngleToVector(double angle, double length = 1);
native clearscope static Vector2 RotateVector(Vector2 vec, double angle);
native clearscope static double Normalize180(double ang);
bool IsPointerEqual(int ptr_select1, int ptr_select2)
@ -419,7 +419,7 @@ class Actor : Thinker native
return GetPointer(ptr_select1) == GetPointer(ptr_select2);
}
static double BobSin(double fb)
clearscope static double BobSin(double fb)
{
return sin(fb * (180./32)) * 8;
}
@ -547,7 +547,7 @@ class Actor : Thinker native
native static class<Actor> GetReplacement(class<Actor> cls);
native static class<Actor> GetReplacee(class<Actor> cls);
native static int GetSpriteIndex(name sprt);
native static double GetDefaultSpeed(class<Actor> type);
native clearscope static double GetDefaultSpeed(class<Actor> type);
native static class<Actor> GetSpawnableType(int spawnnum);
native static int ApplyDamageFactors(class<Inventory> itemcls, Name damagetype, int damage, int defdamage);
native void RemoveFromHash();
@ -667,7 +667,7 @@ class Actor : Thinker native
native void RandomChaseDir();
native bool CheckMissileRange();
native bool SetState(state st, bool nofunction = false);
native state FindState(statelabel st, bool exact = false);
clearscope native state FindState(statelabel st, bool exact = false) const;
bool SetStateLabel(statelabel st, bool nofunction = false) { return SetState(FindState(st), nofunction); }
native action state ResolveState(statelabel st); // this one, unlike FindState, is context aware.
native void LinkToWorld(LinkContext ctx = null);
@ -689,7 +689,7 @@ class Actor : Thinker native
native clearscope bool isFriend(Actor other) const;
native clearscope bool isHostile(Actor other) const;
native void AdjustFloorClip();
native DropItem GetDropItems();
native clearscope DropItem GetDropItems() const;
native void CopyFriendliness (Actor other, bool changeTarget, bool resetHealth = true);
native bool LookForMonsters();
native bool LookForTid(bool allaround, LookExParams params = null);