From e7e8550c82366e4ab38004b971e299dc4561b80c Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Tue, 10 May 2022 15:00:44 -0700
Subject: [PATCH] Convert all classes to use the new parent names. The old ones
 were marked for deprecation long ago.

---
 src/server/armoury_entity.qc        | 2 +-
 src/server/gamerules_multiplayer.qc | 2 +-
 src/server/hostage_entity.qc        | 8 ++++----
 src/server/info_hostage_rescue.qc   | 5 ++---
 src/server/item_suit.qc             | 4 ++--
 src/shared/item_c4bomb.qc           | 4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/server/armoury_entity.qc b/src/server/armoury_entity.qc
index bb82ee7..346a617 100644
--- a/src/server/armoury_entity.qc
+++ b/src/server/armoury_entity.qc
@@ -180,7 +180,7 @@ armoury_entity::SpawnKey(string strKey, string strValue)
 		}
 		break;
 	default:
-		CBaseEntity::SpawnKey(strKey, strValue);
+		super::SpawnKey(strKey, strValue);
 		break;
 	}
 }
diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc
index 1867bee..52e16d7 100644
--- a/src/server/gamerules_multiplayer.qc
+++ b/src/server/gamerules_multiplayer.qc
@@ -493,7 +493,7 @@ CSMultiplayerRules::RestartRound(int iWipe)
 
 	// Respawn all the entities
 	for (entity a = world; (a = findfloat(a, ::identity, 1));) {
-		CBaseEntity caw = (CBaseEntity)a;
+		NSEntity caw = (NSEntity)a;
 		if (caw.classname != "player")
 			caw.Respawn();
 	}
diff --git a/src/server/hostage_entity.qc b/src/server/hostage_entity.qc
index 93dc00f..6484136 100644
--- a/src/server/hostage_entity.qc
+++ b/src/server/hostage_entity.qc
@@ -76,7 +76,7 @@ enum
 	HOSA_DEADTABLE3
 };
 
-class hostage_entity:CBaseNPC
+class hostage_entity:NSTalkMonster
 {
 	int m_iUsedOnce;
 
@@ -125,7 +125,7 @@ hostage_entity::OnPlayerUse(void)
 		m_iUsedOnce = TRUE;
 	}
 
-	CBaseNPC::OnPlayerUse();
+	NSTalkMonster::OnPlayerUse();
 }
 
 void
@@ -202,7 +202,7 @@ hostage_entity::Death(void)
 void
 hostage_entity::Respawn(void)
 {
-	CBaseNPC::Respawn();
+	NSTalkMonster::Respawn();
 	m_iFlags |= MONSTER_CANFOLLOW;
 	m_iUsedOnce = FALSE;
 	PlayerUse = OnPlayerUse;
@@ -240,6 +240,6 @@ hostage_entity::hostage_entity(void)
 	base_health = 100;
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
-	CBaseNPC::CBaseNPC();
+	NSTalkMonster::NSTalkMonster();
 	g_cs_hostagestotal++;
 }
diff --git a/src/server/info_hostage_rescue.qc b/src/server/info_hostage_rescue.qc
index 66ecfe6..5b8d204 100644
--- a/src/server/info_hostage_rescue.qc
+++ b/src/server/info_hostage_rescue.qc
@@ -48,7 +48,7 @@ info_hostage_rescue::touch(void)
 		return;
 	}
 
-	CBaseNPC hosty = (CBaseNPC)other;
+	NSTalkMonster hosty = (NSTalkMonster)other;
 
 	if (hosty.solid == SOLID_NOT) {
 		return;
@@ -68,8 +68,7 @@ info_hostage_rescue::touch(void)
 	 * bonus for every hostage they rescue, even if they lose the round. */
 	Money_QueTeamReward(TEAM_CT, 850);
 
-	CBaseEntity targa = (CBaseEntity)other;
-	targa.Hide();
+	hosty.Hide();
 }
 
 void
diff --git a/src/server/item_suit.qc b/src/server/item_suit.qc
index dc45e75..59b3be2 100644
--- a/src/server/item_suit.qc
+++ b/src/server/item_suit.qc
@@ -14,7 +14,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-class item_suit:CBaseTrigger
+class item_suit:NSRenderableEntity
 {
 	void(void) item_suit;
 
@@ -67,6 +67,6 @@ item_suit::item_suit(void)
 {
 	model = "models/w_kevlar.mdl";
 	precache_sound("items/tr_kevlar.wav");
-	CBaseTrigger::CBaseTrigger();
+	NSRenderableEntity::NSRenderableEntity();
 	Respawn();
 }
diff --git a/src/shared/item_c4bomb.qc b/src/shared/item_c4bomb.qc
index e414e68..0711f26 100644
--- a/src/shared/item_c4bomb.qc
+++ b/src/shared/item_c4bomb.qc
@@ -14,7 +14,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-class item_c4:CBaseEntity
+class item_c4:NSRenderableEntity
 {
 #ifdef SERVER
 	entity m_eUser;
@@ -136,7 +136,7 @@ item_c4::Logic(void)
 		Sound_Play(this, CHAN_VOICE, "weapon_c4bomb.explode");
 
 		for (entity e = world; (e = find(e, ::classname, "func_bomb_target"));) {
-			CBaseTrigger trigger = (CBaseTrigger)e;
+			NSEntity trigger = (NSEntity)e;
 			if (trigger.Trigger != __NULL__) {
 				trigger.Trigger(this, TRIG_TOGGLE);
 			}