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 14:59:40 -07:00
parent 281b50d69d
commit fa69bd0d83
Signed by: eukara
GPG Key ID: C196CD8BA993248A
3 changed files with 12 additions and 11 deletions

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 info_player_teamspawn:CBaseTrigger class info_player_teamspawn:NSRenderableEntity
{ {
void(void) info_player_teamspawn; void(void) info_player_teamspawn;
}; };

View File

@ -59,7 +59,7 @@ typedef enumflags
} tfgoal_result; } tfgoal_result;
/* point entity version */ /* point entity version */
class info_tfgoal:CBaseTrigger class info_tfgoal:NSRenderableEntity
{ {
string m_strName; string m_strName;
string m_strActivatedSound; string m_strActivatedSound;
@ -387,7 +387,7 @@ info_tfgoal::SpawnKey(string strKey, string strValue)
m_iMedikit = stoi(strValue); m_iMedikit = stoi(strValue);
break; break;
default: default:
CBaseTrigger::SpawnKey(strKey, strValue); super::SpawnKey(strKey, strValue);
break; break;
} }
} }
@ -404,7 +404,7 @@ info_tfgoal::info_tfgoal(void)
precache_sound(m_strActivatedSound); precache_sound(m_strActivatedSound);
CBaseEntity::CBaseEntity(); super::NSRenderableEntity();
info_tfgoal::Respawn(); info_tfgoal::Respawn();
} }
@ -436,7 +436,7 @@ i_t_g::i_t_g(void)
SpawnKey(argv(i), argv(i+1)); SpawnKey(argv(i), argv(i+1));
} }
CBaseEntity::CBaseEntity(); super::NSRenderableEntity();
precache_sound(m_strActivatedSound); precache_sound(m_strActivatedSound);
Respawn(); Respawn();

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 item_tfgoal:CBaseTrigger class item_tfgoal:NSRenderableEntity
{ {
float m_dItemID; float m_dItemID;
@ -40,19 +40,19 @@ class item_tfgoal:CBaseTrigger
string m_voxNonOwnerTeams; /* non-owner team */ string m_voxNonOwnerTeams; /* non-owner team */
void(void) item_tfgoal; void(void) item_tfgoal;
virtual void(void) touch; virtual void(entity) Touch;
virtual void(void) Respawn; virtual void(void) Respawn;
virtual void(string, string) SpawnKey; virtual void(string, string) SpawnKey;
}; };
void void
item_tfgoal::touch(void) item_tfgoal::Touch(entity eToucher)
{ {
if (other.classname != "player") { if (eToucher.classname != "player") {
return; return;
} }
player pl = (player)other; player pl = (player)eToucher;
/* team filter */ /* team filter */
if (m_iTeamUses) if (m_iTeamUses)
@ -182,6 +182,7 @@ item_tfgoal::SpawnKey(string strKey, string strValue)
m_voxNonOwnerTeams = strValue; /* non-owner team */ m_voxNonOwnerTeams = strValue; /* non-owner team */
break; break;
default: default:
super::SpawnKey(strKey, strValue);
break; break;
} }
} }
@ -194,6 +195,6 @@ item_tfgoal::item_tfgoal(void)
} }
precache_sound(m_strSound); precache_sound(m_strSound);
CBaseEntity::CBaseEntity(); super::NSRenderableEntity();
item_tfgoal::Respawn(); item_tfgoal::Respawn();
} }