Clean up spawnfuncs a bit

diff --git a/monsters.cfg b/monsters.cfg
index d506ee15174c32f285f7fcffd20efb6a34dcac44..6d06e6323abc8daac6d0ebc94d12622a453efd4a 100644 (file)
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -24,7 +24,7 @@ set g_monsters_skill_normal 4 "Monster normal skill level (used for skill based
 set g_monsters_skill_hard 5 "Monster hard skill level (used for skill based functions)"
 set g_monsters_skill_insane 7 "Monster insane skill level (used for skill based functions)"
 set g_monsters_skill_nightmare 10 "Monster nightmare skill level (used for skill based functions)"
-set g_monsters_spawn_list "ogre demon shambler knight soldier scrag dog spawn hellknight fish vore zombie spider" "monsters not listed here will spawn as knights"
+set g_monsters_spawn_list "ogre demon shambler knight marine scrag dog tarbaby hellknight fish vore zombie spider" "monsters not listed here will spawn as knights"
 
 // Ogre
 set g_monster_ogre 1 "Enable Ogres"

diff --git a/qcsrc/server/monsters/monster/demon.qc b/qcsrc/server/monsters/monster/demon.qc
index 91c59760173aa715e15316c0b815ce5bb2056d15..dd3df70adb99dc0e373e0c3aeb675577825ce384 100644 (file)
--- a/qcsrc/server/monsters/monster/demon.qc
+++ b/qcsrc/server/monsters/monster/demon.qc
@@ -120,7 +120,7 @@ void spawnfunc_monster_demon ()
        }
 }
 
-// Compatibility with old spawns
-void spawnfunc_monster_demon1 () { spawnfunc_monster_demon(); }
+// compatibility with old spawns
+void spawnfunc_monster_demon1() { spawnfunc_monster_demon(); }
 
 #endif // SVQC

diff --git a/qcsrc/server/monsters/monster/hknight.qc b/qcsrc/server/monsters/monster/hknight.qc
index 518edf5b7f16b874a65eb800201f5e72041687ad..3761f29587f0bce6b210d5d40893b733af98456e 100644 (file)
--- a/qcsrc/server/monsters/monster/hknight.qc
+++ b/qcsrc/server/monsters/monster/hknight.qc
@@ -430,11 +430,11 @@ void hellknight_spawn ()
        monster_hook_spawn(); // for post-spawn mods
 }
 
-void spawnfunc_monster_hell_knight ()
+void spawnfunc_monster_hellknight ()
 {      
        if not(autocvar_g_monster_hellknight) { remove(self); return; }
        
-       self.monster_spawnfunc = spawnfunc_monster_hell_knight;
+       self.monster_spawnfunc = spawnfunc_monster_hellknight;
        
        if(Monster_CheckAppearFlags(self))
                return;
@@ -453,6 +453,6 @@ void spawnfunc_monster_hell_knight ()
 }
 
 // compatibility with old spawns
-void spawnfunc_monster_hellknight () { spawnfunc_monster_hell_knight(); }
+void spawnfunc_monster_hell_knight() { spawnfunc_monster_hellknight(); }
 
 #endif // SVQC

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index c38e0e948c105b1bb64bd0b5ec0620c6edc305e4..e6191c8884bac4f2eae69e60b583654b73b9d881 100644 (file)
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -439,7 +439,6 @@ void spawnfunc_monster_mage()
 }
 
 // compatibility with old spawns
-void spawnfunc_monster_vore () { spawnfunc_monster_mage(); }
-void spawnfunc_monster_shalrath () { spawnfunc_monster_mage(); }
+void spawnfunc_monster_shalrath() { spawnfunc_monster_mage(); }
 
 #endif // SVQC

diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc
index 60ac320be98f2d7e079c582e79c7fb3517bd0e01..06a8ccb6e349aec10ee9ca693992977ee76cfea9 100644 (file)
--- a/qcsrc/server/monsters/monster/soldier.qc
+++ b/qcsrc/server/monsters/monster/soldier.qc
@@ -368,7 +368,6 @@ void spawnfunc_monster_marine()
 }
 
 // compatibility with old spawns
-void spawnfunc_monster_army () { spawnfunc_monster_marine(); }
-void spawnfunc_monster_soldier () { spawnfunc_monster_marine(); }
+void spawnfunc_monster_army() { spawnfunc_monster_marine(); }
 
 #endif // SVQC

diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc
index 380722daa0c2a51ee7d3ff74f15298b5029045e9..6fc0743bd9b76e0ddbff03878b9fe403ec6ca1da 100644 (file)
--- a/qcsrc/server/monsters/monster/tarbaby.qc
+++ b/qcsrc/server/monsters/monster/tarbaby.qc
@@ -137,7 +137,4 @@ void spawnfunc_monster_tarbaby ()
        }
 }
 
-// compatibility with old spawns
-void spawnfunc_monster_spawn () { spawnfunc_monster_tarbaby(); }
-
 #endif // SVQC

diff --git a/qcsrc/server/monsters/monster/wizard.qc b/qcsrc/server/monsters/monster/wizard.qc
index c56bade719c0299af6287ef021c73a9b545e27f3..99fde15e5e76c2026ecd02989ea64d4a892e6766 100644 (file)
--- a/qcsrc/server/monsters/monster/wizard.qc
+++ b/qcsrc/server/monsters/monster/wizard.qc
@@ -138,11 +138,11 @@ void wizard_spawn ()
        monster_hook_spawn(); // for post-spawn mods
 }
 
-void spawnfunc_monster_wizard ()
+void spawnfunc_monster_scrag ()
 {      
        if not(autocvar_g_monster_wizard) { remove(self); return; }
        
-       self.monster_spawnfunc = spawnfunc_monster_wizard;
+       self.monster_spawnfunc = spawnfunc_monster_scrag;
        
        if(Monster_CheckAppearFlags(self))
                return;
@@ -161,6 +161,6 @@ void spawnfunc_monster_wizard ()
 }
 
 // compatibility with old spawns
-void spawnfunc_monster_scrag () { spawnfunc_monster_wizard(); }
+void spawnfunc_monster_wizard() { spawnfunc_monster_scrag(); }
 
 #endif // SVQC