Added GetDecalName()

RicardoLuis0 · Sep 25, 2024 · 8c10ac6 · 8c10ac6
1 parent 3524d06
commit 8c10ac6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/src/gamedata/decallib.cpp b/src/gamedata/decallib.cpp
@@ -205,6 +205,11 @@ const FDecalTemplate *FDecalBase::GetDecal () const
 	return NULL;
 }
 
+FName FDecalBase::GetDecalName() const
+{
+	return Name;
+}
+
 void FDecalTemplate::ReplaceDecalRef(FDecalBase *from, FDecalBase *to)
 {
 	if (LowerDecal == from)

diff --git a/src/gamedata/decallib.h b/src/gamedata/decallib.h
@@ -53,6 +53,7 @@ class FDecalBase
 public:
 	virtual const FDecalTemplate *GetDecal () const;
 	virtual void ReplaceDecalRef (FDecalBase *from, FDecalBase *to) = 0;
+	FName GetDecalName() const;
 
 protected:
 	FDecalBase ();

diff --git a/src/playsim/a_decals.cpp b/src/playsim/a_decals.cpp
@@ -934,3 +934,20 @@ DEFINE_ACTION_FUNCTION_NATIVE(ADecal, SpawnDecal, SpawnDecal)
 	SpawnDecal(self);
 	return 0;
 }
+
+//----------------------------------------------------------------------------
+//
+//
+//
+//----------------------------------------------------------------------------
+
+static int GetDecalName(AActor* self)
+{
+	return self->DecalGenerator != nullptr ? self->DecalGenerator->GetDecalName().GetIndex() : NAME_None;
+}
+
+DEFINE_ACTION_FUNCTION_NATIVE(AActor, GetDecalName, GetDecalName)
+{
+	PARAM_SELF_PROLOGUE(AActor);
+	ACTION_RETURN_INT(GetDecalName(self));
+}
diff --git a/wadsrc/static/zscript/actors/actor.zs b/wadsrc/static/zscript/actors/actor.zs
@@ -715,6 +715,7 @@ class Actor : Thinker native
 	native void ClearFOVInterpolation();
 	native clearscope Vector3 PosRelative(sector sec) const;
 	native void RailAttack(FRailParams p);
+	native clearscope Name GetDecalName() const;
 
 	native void HandleSpawnFlags();
 	native void ExplodeMissile(line lin = null, Actor target = null, bool onsky = false);