From: Mario <mario.mario@y7mail.com>
Date: Tue, 23 Apr 2013 15:34:56 +0000 (+1000)
Subject: Clean up spawnfuncs a bit
X-Git-Tag: xonotic-v0.8.0~241^2^2~285
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e23aa44541171994a2668a5d4ed78990e2473d3d;p=xonotic%2Fxonotic-data.pk3dir.git

Clean up spawnfuncs a bit
---

diff --git a/monsters.cfg b/monsters.cfg
index d506ee151..6d06e6323 100644
--- 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 91c597601..dd3df70ad 100644
--- 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 518edf5b7..3761f2958 100644
--- 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 c38e0e948..e6191c888 100644
--- 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 60ac320be..06a8ccb6e 100644
--- 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 380722daa..6fc0743bd 100644
--- 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 c56bade71..99fde15e5 100644
--- 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