From 1019c169135fd7bd5eedd5c826b2aa633b45d51f Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Thu, 16 Sep 2021 18:37:40 +0200
Subject: [PATCH] Use GetSpawnX() methods instead of peeking into some
 attribute that may change.

---
 src/server/ammo_op4.qc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/server/ammo_op4.qc b/src/server/ammo_op4.qc
index 0adf11d..d811ca1 100644
--- a/src/server/ammo_op4.qc
+++ b/src/server/ammo_op4.qc
@@ -108,7 +108,7 @@ ammo_spore::ammo_spore(void)
 void
 ammo_spore::Death(void)
 {
-	makevectors(m_oldAngle);
+	makevectors(GetSpawnAngles());
 	Sporelauncher_AltFire(this, origin, v_forward);
 	frame = 2;
 	m_iBody = 0;
@@ -126,15 +126,15 @@ ammo_spore::Respawn(void)
 	takedamage = DAMAGE_YES;
 	health = 1;
 
-	if (m_oldModel) {
-		SetModel(m_oldModel);
+	if (GetSpawnModel()) {
+		SetModel(GetSpawnModel());
 	}
 
 	solid = SOLID_NOT;
 	setsize(this, [0,0,0], [0,0,0]);
-	SetOrigin(m_oldOrigin);
+	SetOrigin(GetSpawnOrigin());
 
-	decal_pickwall(this, m_oldOrigin);
+	decal_pickwall(this, GetSpawnOrigin());
 
 	/* we never hit any wall. */
 	if (g_tracedDecal.fraction == 1.0f) {