Convert all classes to use the new parent names. The old ones were marked for deprecation long ago.

This commit is contained in:
Marco Cawthorne 2022-05-10 15:00:25 -07:00
parent a8a9b33c4f
commit 42a5bc99be
Signed by: eukara
GPG key ID: C196CD8BA993248A
8 changed files with 26 additions and 18 deletions

View file

@ -14,8 +14,10 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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; int m_iBody;
virtual void(string, string) SpawnKey; virtual void(string, string) SpawnKey;
}; };
@ -37,11 +39,17 @@ CBaseDecor::SpawnKey(string strField, string strKey)
m_iBody = stoi(strKey); m_iBody = stoi(strKey);
break; break;
default: default:
CBaseEntity::SpawnKey(strField, strKey); super::SpawnKey(strField, strKey);
break; break;
} }
} }
void
CBaseDecor::CBaseDecor(void)
{
super::NSRenderableEntity();
}
/* Let's begin */ /* Let's begin */
class decore_asteroid:CBaseDecor class decore_asteroid:CBaseDecor
{ {
@ -155,7 +163,7 @@ class decore_spacedebris:CBaseDecor
model = strKey; model = strKey;
break; break;
default: default:
CBaseEntity::SpawnKey(strField, strKey); super::SpawnKey(strField, strKey);
break; break;
} }
}; };

View file

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
class hologram_damage:CBaseNPC class hologram_damage:NSTalkMonster
{ {
int m_iType; int m_iType;
@ -51,7 +51,7 @@ hologram_damage::SpawnKey(string strKey, string strValue)
m_iType = stoi(strValue); m_iType = stoi(strValue);
break; break;
default: default:
CBaseNPC::SpawnKey(strKey, strValue); NSTalkMonster::SpawnKey(strKey, strValue);
} }
} }
@ -60,5 +60,5 @@ hologram_damage::hologram_damage(void)
{ {
base_mins = [-16,-16,0]; base_mins = [-16,-16,0];
base_maxs = [16,16,72]; base_maxs = [16,16,72];
CBaseNPC::CBaseNPC(); NSTalkMonster::NSTalkMonster();
} }

View file

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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; void(void) monster_human_bandit;
}; };
@ -25,5 +25,5 @@ monster_human_bandit::monster_human_bandit(void)
model = "models/bandit.mdl"; model = "models/bandit.mdl";
base_mins = [-16,-16,0]; base_mins = [-16,-16,0];
base_maxs = [16,16,72]; base_maxs = [16,16,72];
CBaseNPC::CBaseNPC(); NSTalkMonster::NSTalkMonster();
} }

View file

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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; void(void) monster_human_chopper;
}; };
@ -25,5 +25,5 @@ monster_human_chopper::monster_human_chopper(void)
model = "models/chopper.mdl"; model = "models/chopper.mdl";
base_mins = [-16,-16,0]; base_mins = [-16,-16,0];
base_maxs = [16,16,72]; base_maxs = [16,16,72];
CBaseNPC::CBaseNPC(); NSTalkMonster::NSTalkMonster();
} }

View file

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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; void(void) monster_human_demoman;
}; };
@ -25,5 +25,5 @@ monster_human_demoman::monster_human_demoman(void)
model = "models/demolitionman.mdl"; model = "models/demolitionman.mdl";
base_mins = [-16,-16,0]; base_mins = [-16,-16,0];
base_maxs = [16,16,72]; base_maxs = [16,16,72];
CBaseNPC::CBaseNPC(); NSTalkMonster::NSTalkMonster();
} }

View file

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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; void(void) monster_human_gunman;
}; };
@ -25,5 +25,5 @@ monster_human_gunman::monster_human_gunman(void)
model = "models/gunmantrooper.mdl"; model = "models/gunmantrooper.mdl";
base_mins = [-16,-16,0]; base_mins = [-16,-16,0];
base_maxs = [16,16,72]; base_maxs = [16,16,72];
CBaseNPC::CBaseNPC(); NSTalkMonster::NSTalkMonster();
} }

View file

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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; void(void) monster_human_unarmed;
}; };
@ -25,5 +25,5 @@ monster_human_unarmed::monster_human_unarmed(void)
model = "models/gunmantrooper.mdl"; model = "models/gunmantrooper.mdl";
base_mins = [-16,-16,0]; base_mins = [-16,-16,0];
base_maxs = [16,16,72]; base_maxs = [16,16,72];
CBaseNPC::CBaseNPC(); NSTalkMonster::NSTalkMonster();
} }

View file

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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; void(void) monster_trainingbot;
}; };
@ -25,5 +25,5 @@ monster_trainingbot::monster_trainingbot(void)
model = "models/gunmantrooper.mdl"; model = "models/gunmantrooper.mdl";
base_mins = [-16,-16,0]; base_mins = [-16,-16,0];
base_maxs = [16,16,72]; base_maxs = [16,16,72];
CBaseNPC::CBaseNPC(); NSTalkMonster::NSTalkMonster();
} }