From cf5201f8f1ee6008289df50610a9fb8fa1bfbac6 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 20 Jun 2017 21:12:04 +1000 Subject: [PATCH] Remove mr_precache (now unused) --- qcsrc/common/monsters/monster.qh | 2 -- qcsrc/common/monsters/monster/mage.qc | 6 ------ qcsrc/common/monsters/monster/mage.qh | 6 +----- qcsrc/common/monsters/monster/shambler.qc | 6 ------ qcsrc/common/monsters/monster/shambler.qh | 6 +----- qcsrc/common/monsters/monster/spider.qc | 6 ------ qcsrc/common/monsters/monster/spider.qh | 6 +----- qcsrc/common/monsters/monster/wyvern.qc | 6 ------ qcsrc/common/monsters/monster/wyvern.qh | 6 +----- qcsrc/common/monsters/monster/zombie.qc | 6 ------ qcsrc/common/monsters/monster/zombie.qh | 6 +----- 11 files changed, 5 insertions(+), 57 deletions(-) diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh index 841e7ef40..aba9c9aa9 100644 --- a/qcsrc/common/monsters/monster.qh +++ b/qcsrc/common/monsters/monster.qh @@ -48,8 +48,6 @@ CLASS(Monster, Object) METHOD(Monster, mr_think, bool(Monster this, entity actor)) { TC(Monster, this); return false; } /** (SERVER) called when monster dies */ METHOD(Monster, mr_death, bool(Monster this, entity actor)) { TC(Monster, this); return false; } - /** (BOTH) precaches models/sounds used by this monster */ - METHOD(Monster, mr_precache, bool(Monster this)) { TC(Monster, this); return false; } /** (SERVER) called when monster is damaged */ METHOD(Monster, mr_pain, float(Monster this, entity actor, float damage_take, entity attacker, float deathtype)) { TC(Monster, this); return damage_take; } /** (BOTH?) sets animations for monster */ diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index 5b95b2c9f..f6f8b803b 100644 --- a/qcsrc/common/monsters/monster/mage.qc +++ b/qcsrc/common/monsters/monster/mage.qc @@ -464,10 +464,4 @@ METHOD(Mage, mr_setup, bool(Mage this, entity actor)) return true; } - -METHOD(Mage, mr_precache, bool(Mage this)) -{ - TC(Mage, this); - return true; -} #endif diff --git a/qcsrc/common/monsters/monster/mage.qh b/qcsrc/common/monsters/monster/mage.qh index 194b6b2b2..98fb76673 100644 --- a/qcsrc/common/monsters/monster/mage.qh +++ b/qcsrc/common/monsters/monster/mage.qh @@ -17,11 +17,7 @@ CLASS(Mage, Monster) ATTRIB(Mage, monster_name, string, _("Mage")); ENDCLASS(Mage) -REGISTER_MONSTER(MAGE, NEW(Mage)) { -#ifdef GAMEQC - this.mr_precache(this); -#endif -} +REGISTER_MONSTER(MAGE, NEW(Mage)); #include #include diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc index d234e2604..b03766bcf 100644 --- a/qcsrc/common/monsters/monster/shambler.qc +++ b/qcsrc/common/monsters/monster/shambler.qc @@ -263,10 +263,4 @@ METHOD(Shambler, mr_setup, bool(Shambler this, entity actor)) return true; } - -METHOD(Shambler, mr_precache, bool(Shambler this)) -{ - TC(Shambler, this); - return true; -} #endif diff --git a/qcsrc/common/monsters/monster/shambler.qh b/qcsrc/common/monsters/monster/shambler.qh index fde28e9f4..554fe5fe6 100644 --- a/qcsrc/common/monsters/monster/shambler.qh +++ b/qcsrc/common/monsters/monster/shambler.qh @@ -17,8 +17,4 @@ CLASS(Shambler, Monster) ATTRIB(Shambler, monster_name, string, _("Shambler")); ENDCLASS(Shambler) -REGISTER_MONSTER(SHAMBLER, NEW(Shambler)) { -#ifdef GAMEQC - this.mr_precache(this); -#endif -} +REGISTER_MONSTER(SHAMBLER, NEW(Shambler)); diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index 3a22b360d..a65513920 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -238,10 +238,4 @@ METHOD(Spider, mr_setup, bool(Spider this, entity actor)) return true; } - -METHOD(Spider, mr_precache, bool(Spider this)) -{ - TC(Spider, this); - return true; -} #endif diff --git a/qcsrc/common/monsters/monster/spider.qh b/qcsrc/common/monsters/monster/spider.qh index cd7fa9e6b..3a688de32 100644 --- a/qcsrc/common/monsters/monster/spider.qh +++ b/qcsrc/common/monsters/monster/spider.qh @@ -17,11 +17,7 @@ CLASS(Spider, Monster) ATTRIB(Spider, monster_name, string, _("Spider")); ENDCLASS(Spider) -REGISTER_MONSTER(SPIDER, NEW(Spider)) { -#ifdef GAMEQC - this.mr_precache(this); -#endif -} +REGISTER_MONSTER(SPIDER, NEW(Spider)); #include diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc index b4a76c99f..38df673dd 100644 --- a/qcsrc/common/monsters/monster/wyvern.qc +++ b/qcsrc/common/monsters/monster/wyvern.qc @@ -162,10 +162,4 @@ METHOD(Wyvern, mr_setup, bool(Wyvern this, entity actor)) return true; } - -METHOD(Wyvern, mr_precache, bool(Wyvern this)) -{ - TC(Wyvern, this); - return true; -} #endif diff --git a/qcsrc/common/monsters/monster/wyvern.qh b/qcsrc/common/monsters/monster/wyvern.qh index 012c9c2a5..2326b0dd1 100644 --- a/qcsrc/common/monsters/monster/wyvern.qh +++ b/qcsrc/common/monsters/monster/wyvern.qh @@ -17,11 +17,7 @@ CLASS(Wyvern, Monster) ATTRIB(Wyvern, monster_name, string, _("Wyvern")); ENDCLASS(Wyvern) -REGISTER_MONSTER(WYVERN, NEW(Wyvern)) { -#ifdef GAMEQC - this.mr_precache(this); -#endif -} +REGISTER_MONSTER(WYVERN, NEW(Wyvern)); #include diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc index 6893d31b6..d5011c7f3 100644 --- a/qcsrc/common/monsters/monster/zombie.qc +++ b/qcsrc/common/monsters/monster/zombie.qc @@ -203,10 +203,4 @@ METHOD(Zombie, mr_setup, bool(Zombie this, entity actor)) return true; } - -METHOD(Zombie, mr_precache, bool(Zombie this)) -{ - TC(Zombie, this); - return true; -} #endif diff --git a/qcsrc/common/monsters/monster/zombie.qh b/qcsrc/common/monsters/monster/zombie.qh index dfa37556d..1572a95ea 100644 --- a/qcsrc/common/monsters/monster/zombie.qh +++ b/qcsrc/common/monsters/monster/zombie.qh @@ -17,8 +17,4 @@ CLASS(Zombie, Monster) ATTRIB(Zombie, monster_name, string, _("Zombie")); ENDCLASS(Zombie) -REGISTER_MONSTER(ZOMBIE, NEW(Zombie)) { -#ifdef GAMEQC - this.mr_precache(this); -#endif -} +REGISTER_MONSTER(ZOMBIE, NEW(Zombie)); -- 2.39.2