Use a cvar for monster list rather than a hardcoded string (invalid value is replaced...

diff --git a/monsters.cfg b/monsters.cfg
index cae7a40eb2a0554330b4224805bbd1b2cbbff73c..cddda3c4cdcc16c4a4f87a5fde6dbb317b18f85b 100644 (file)
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -23,6 +23,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 enforcer zombie spawner spider" "monsters not listed here will spawn as knights"
 
 // Enforcer
 set g_monster_enforcer 1 "Enable Enforcers"

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 3b8a4975986ec9f0d189d5cd43a2d787e06f0f71..8d4e07edacdd5a4afc3d092b3f0a19383878dc68 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1326,3 +1326,4 @@ float autocvar_g_monsters_skill_normal;
 float autocvar_g_monsters_skill_hard;
 float autocvar_g_monsters_skill_insane;
 float autocvar_g_monsters_skill_nightmare;
+string autocvar_g_monsters_spawn_list;
\ No newline at end of file

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index b4048a721d8923f96ca2beabfa5df8d980aa033e..26ef72b748da1dad793e5a30b0cba35e45af6b68 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -199,7 +199,7 @@ void ClientCommand_mobspawn(float request, float argc)
                        if(tospawn == "list")
                        {
                                sprint(self, "Available monsters:\n");
-                               sprint(self, strcat(monsterlist(), "\n"));
+                               sprint(self, strcat(autocvar_g_monsters_spawn_list, "\n"));
                                return;
                        }
                        

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 368ce705f7209bb2d8f4ca93d393319701bfb624..ae94b7fc8f4e27938b0589af36e64ba1b370649d 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -655,4 +655,3 @@ float spawncode_first_load; // used to tell the player the monster database is l
 float monsters_total;
 float monsters_killed;
 void monsters_setstatus(); // monsters.qc
-string monsterlist();

diff --git a/qcsrc/server/monsters/lib/spawn.qc b/qcsrc/server/monsters/lib/spawn.qc
index 6a9fa3fe4bb91a0bab9758f7e614a263a8018b81..bb707b3eaedf801a2b4450df815333046eb78151 100644 (file)
--- a/qcsrc/server/monsters/lib/spawn.qc
+++ b/qcsrc/server/monsters/lib/spawn.qc
@@ -35,7 +35,7 @@ entity spawnmonster (string monster, entity spawnedby, entity own, vector orig,
        
        setorigin(e, orig);
        
-       if not(spawnmonster_checkinlist(monster, monsterlist()))
+       if not(spawnmonster_checkinlist(monster, autocvar_g_monsters_spawn_list))
                monster = "knight";
        
        e.realowner = spawnedby;

diff --git a/qcsrc/server/monsters/monsters.qh b/qcsrc/server/monsters/monsters.qh
index 67eec4b69ae9e1d95f2f35b357c225e5614e6e45..a9695490b874d858367c31a47cb3246e401a003f 100644 (file)
--- a/qcsrc/server/monsters/monsters.qh
+++ b/qcsrc/server/monsters/monsters.qh
@@ -19,4 +19,3 @@
 #include "monster/zombie.qc"
 #include "monster/spider.qc"
 #include "monster/spawner.qc"
-string monsterlist () { return "ogre demon shambler knight soldier scrag dog spawn hellknight fish vore enforcer zombie spawner spider"; }
\ No newline at end of file