From 42a5bc99be3ef70ef21f98467d68fbf90bd21a47 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Tue, 10 May 2022 15:00:25 -0700 Subject: [PATCH] Convert all classes to use the new parent names. The old ones were marked for deprecation long ago. --- src/client/decore.qc | 14 +++++++++++--- src/server/hologram_damage.qc | 6 +++--- src/server/monster_human_bandit.qc | 4 ++-- src/server/monster_human_chopper.qc | 4 ++-- src/server/monster_human_demoman.qc | 4 ++-- src/server/monster_human_gunman.qc | 4 ++-- src/server/monster_human_unarmed.qc | 4 ++-- src/server/monster_trainingbot.qc | 4 ++-- 8 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/client/decore.qc b/src/client/decore.qc index aba3191..75b7f88 100644 --- a/src/client/decore.qc +++ b/src/client/decore.qc @@ -14,8 +14,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class CBaseDecor:CBaseEntity +class CBaseDecor:NSRenderableEntity { + void(void) CBaseDecor; + int m_iBody; virtual void(string, string) SpawnKey; }; @@ -37,11 +39,17 @@ CBaseDecor::SpawnKey(string strField, string strKey) m_iBody = stoi(strKey); break; default: - CBaseEntity::SpawnKey(strField, strKey); + super::SpawnKey(strField, strKey); break; } } +void +CBaseDecor::CBaseDecor(void) +{ + super::NSRenderableEntity(); +} + /* Let's begin */ class decore_asteroid:CBaseDecor { @@ -155,7 +163,7 @@ class decore_spacedebris:CBaseDecor model = strKey; break; default: - CBaseEntity::SpawnKey(strField, strKey); + super::SpawnKey(strField, strKey); break; } }; diff --git a/src/server/hologram_damage.qc b/src/server/hologram_damage.qc index 35f6b9e..90a0031 100644 --- a/src/server/hologram_damage.qc +++ b/src/server/hologram_damage.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class hologram_damage:CBaseNPC +class hologram_damage:NSTalkMonster { int m_iType; @@ -51,7 +51,7 @@ hologram_damage::SpawnKey(string strKey, string strValue) m_iType = stoi(strValue); break; default: - CBaseNPC::SpawnKey(strKey, strValue); + NSTalkMonster::SpawnKey(strKey, strValue); } } @@ -60,5 +60,5 @@ hologram_damage::hologram_damage(void) { base_mins = [-16,-16,0]; base_maxs = [16,16,72]; - CBaseNPC::CBaseNPC(); + NSTalkMonster::NSTalkMonster(); } diff --git a/src/server/monster_human_bandit.qc b/src/server/monster_human_bandit.qc index a990397..a451931 100644 --- a/src/server/monster_human_bandit.qc +++ b/src/server/monster_human_bandit.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_bandit:CBaseNPC +class monster_human_bandit:NSTalkMonster { void(void) monster_human_bandit; }; @@ -25,5 +25,5 @@ monster_human_bandit::monster_human_bandit(void) model = "models/bandit.mdl"; base_mins = [-16,-16,0]; base_maxs = [16,16,72]; - CBaseNPC::CBaseNPC(); + NSTalkMonster::NSTalkMonster(); } diff --git a/src/server/monster_human_chopper.qc b/src/server/monster_human_chopper.qc index 64e5135..2692f81 100644 --- a/src/server/monster_human_chopper.qc +++ b/src/server/monster_human_chopper.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_chopper:CBaseNPC +class monster_human_chopper:NSTalkMonster { void(void) monster_human_chopper; }; @@ -25,5 +25,5 @@ monster_human_chopper::monster_human_chopper(void) model = "models/chopper.mdl"; base_mins = [-16,-16,0]; base_maxs = [16,16,72]; - CBaseNPC::CBaseNPC(); + NSTalkMonster::NSTalkMonster(); } diff --git a/src/server/monster_human_demoman.qc b/src/server/monster_human_demoman.qc index 2f81c89..d54de38 100644 --- a/src/server/monster_human_demoman.qc +++ b/src/server/monster_human_demoman.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_demoman:CBaseNPC +class monster_human_demoman:NSTalkMonster { void(void) monster_human_demoman; }; @@ -25,5 +25,5 @@ monster_human_demoman::monster_human_demoman(void) model = "models/demolitionman.mdl"; base_mins = [-16,-16,0]; base_maxs = [16,16,72]; - CBaseNPC::CBaseNPC(); + NSTalkMonster::NSTalkMonster(); } diff --git a/src/server/monster_human_gunman.qc b/src/server/monster_human_gunman.qc index 11f63da..7b2b6ee 100644 --- a/src/server/monster_human_gunman.qc +++ b/src/server/monster_human_gunman.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_gunman:CBaseNPC +class monster_human_gunman:NSTalkMonster { void(void) monster_human_gunman; }; @@ -25,5 +25,5 @@ monster_human_gunman::monster_human_gunman(void) model = "models/gunmantrooper.mdl"; base_mins = [-16,-16,0]; base_maxs = [16,16,72]; - CBaseNPC::CBaseNPC(); + NSTalkMonster::NSTalkMonster(); } diff --git a/src/server/monster_human_unarmed.qc b/src/server/monster_human_unarmed.qc index 0ddc1e8..3ceebf5 100644 --- a/src/server/monster_human_unarmed.qc +++ b/src/server/monster_human_unarmed.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_unarmed:CBaseNPC +class monster_human_unarmed:NSTalkMonster { void(void) monster_human_unarmed; }; @@ -25,5 +25,5 @@ monster_human_unarmed::monster_human_unarmed(void) model = "models/gunmantrooper.mdl"; base_mins = [-16,-16,0]; base_maxs = [16,16,72]; - CBaseNPC::CBaseNPC(); + NSTalkMonster::NSTalkMonster(); } diff --git a/src/server/monster_trainingbot.qc b/src/server/monster_trainingbot.qc index 74f1ab1..2bd0cc7 100644 --- a/src/server/monster_trainingbot.qc +++ b/src/server/monster_trainingbot.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_trainingbot:CBaseNPC +class monster_trainingbot:NSTalkMonster { void(void) monster_trainingbot; }; @@ -25,5 +25,5 @@ monster_trainingbot::monster_trainingbot(void) model = "models/gunmantrooper.mdl"; base_mins = [-16,-16,0]; base_maxs = [16,16,72]; - CBaseNPC::CBaseNPC(); + NSTalkMonster::NSTalkMonster(); }