From 9e170795d594ca2dbd36c7dba44d13bce91b356d Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Fri, 5 Aug 2022 23:27:48 -0700
Subject: [PATCH] func_tank/tankmortar: Make the smoke and flash sprites assume
 RM_ADDITIVE

---
 src/gs-entbase/server/func_tank.qc       | 24 ++++++++++++++--------
 src/gs-entbase/shared/func_tankmortar.qc | 26 ++++++++++++++----------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/gs-entbase/server/func_tank.qc b/src/gs-entbase/server/func_tank.qc
index 4aa24cd8..253a4ede 100644
--- a/src/gs-entbase/server/func_tank.qc
+++ b/src/gs-entbase/server/func_tank.qc
@@ -186,11 +186,15 @@ func_tank::SpriteSmoke(vector org)
 	if (!m_strSpriteSmoke)
 		return;
 
-	entity smoke = spawn();
-	setmodel(smoke, m_strSpriteSmoke);
-	setorigin(smoke, org);
+	NSRenderableEntity smoke = spawn(NSRenderableEntity);
+	smoke.SetModel(m_strSpriteSmoke);
+	smoke.SetOrigin(org);
 	smoke.think = Die;
 	smoke.nextthink = time + 0.1f;
+	smoke.scale = m_flSpriteScale;
+	smoke.SetRenderMode(RM_ADDITIVE);
+	smoke.SetRenderColor([1,1,1]);
+	smoke.SetRenderAmt(1.0f);
 }
 
 void
@@ -203,11 +207,15 @@ func_tank::SpriteFlash(vector org)
 	if (!m_strSpriteFlash)
 		return;
 
-	entity smoke = spawn();
-	setmodel(smoke, m_strSpriteFlash);
-	setorigin(smoke, org);
-	smoke.think = Die;
-	smoke.nextthink = time + 0.1f;
+	NSRenderableEntity flash = spawn(NSRenderableEntity);
+	flash.SetModel(m_strSpriteFlash);
+	flash.SetOrigin(org);
+	flash.think = Die;
+	flash.nextthink = time + 0.1f;
+	flash.scale = m_flSpriteScale;
+	flash.SetRenderMode(RM_ADDITIVE);
+	flash.SetRenderColor([1,1,1]);
+	flash.SetRenderAmt(1.0f);
 }
 
 void
diff --git a/src/gs-entbase/shared/func_tankmortar.qc b/src/gs-entbase/shared/func_tankmortar.qc
index d8a67d87..dec831c6 100644
--- a/src/gs-entbase/shared/func_tankmortar.qc
+++ b/src/gs-entbase/shared/func_tankmortar.qc
@@ -262,13 +262,15 @@ func_tankmortar::SpriteSmoke(vector org)
 	if (!m_strSpriteSmoke)
 		return;
 
-	entity smoke = spawn();
-	setmodel(smoke, m_strSpriteSmoke);
-	setorigin(smoke, org);
+	NSRenderableEntity smoke = spawn(NSRenderableEntity);
+	smoke.SetModel(m_strSpriteSmoke);
+	smoke.SetOrigin(org);
 	smoke.think = Die;
 	smoke.nextthink = time + 0.1f;
 	smoke.scale = m_flSpriteScale;
-	smoke.effects = EF_FLAG2;
+	smoke.SetRenderMode(RM_ADDITIVE);
+	smoke.SetRenderColor([1,1,1]);
+	smoke.SetRenderAmt(1.0f);
 #endif
 }
 
@@ -283,13 +285,15 @@ func_tankmortar::SpriteFlash(vector org)
 	if (!m_strSpriteFlash)
 		return;
 
-	entity smoke = spawn();
-	setmodel(smoke, m_strSpriteFlash);
-	setorigin(smoke, org);
-	smoke.think = Die;
-	smoke.nextthink = time + 0.1f;
-	smoke.scale = m_flSpriteScale;
-	smoke.effects = EF_FLAG2;
+	NSRenderableEntity flash = spawn(NSRenderableEntity);
+	flash.SetModel(m_strSpriteFlash);
+	flash.SetOrigin(org);
+	flash.think = Die;
+	flash.nextthink = time + 0.1f;
+	flash.scale = m_flSpriteScale;
+	flash.SetRenderMode(RM_ADDITIVE);
+	flash.SetRenderColor([1,1,1]);
+	flash.SetRenderAmt(1.0f);
 #endif
 }