Move monster model precaching/loading to the client

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / monsters / lib / monsters.qc

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 34928345f8f734a1b7dc99a2a3ad6da437edcc6f..4af941e5ce1139c5ffd431cff25813c41b87f79d 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -927,7 +927,6 @@ void monster_hook_spawn()
 }
 
 float monster_initialize(string  net_name, float mon_id,
-                                                string  bodymodel,
                                                 vector  min_s,
                                                 vector  max_s,
                                                 float   nodrop,
@@ -944,10 +943,6 @@ float monster_initialize(string  net_name, float mon_id,
        if(monster_skill == autocvar_g_monsters_skill_insane && (self.spawnflags & MONSTERSKILL_NOTINSANE)) { return FALSE; }
        if(monster_skill >= autocvar_g_monsters_skill_nightmare && (self.spawnflags & MONSTERSKILL_NOTNIGHTMARE)) { return FALSE; }
 
-       if(self.model == "" || self.model == "null")
-       if(bodymodel == "")
-               error("monsters: missing bodymodel!");
-
        if(self.netname == "")
        {
                if(net_name != "" && IS_PLAYER(self.realowner))
@@ -966,22 +961,15 @@ float monster_initialize(string  net_name, float mon_id,
        if(self.spawnflags & MONSTERFLAG_GIANT && !autocvar_g_monsters_nogiants)
                self.scale = 5;
        
-       
        if(self.team && !teamplay)
                self.team = 0;
 
        self.flags = FL_MONSTER;
-       
-       if(self.model && self.model != "null")
-               bodymodel = self.model; // TODO: find out why monsters can become invisible
                
        if not(self.spawnflags & MONSTERFLAG_SPAWNED) // naturally spawned monster
        if not(self.monster_respawned)
                monsters_total += 1;
-       
-       precache_model(bodymodel);
 
-       setmodel(self, bodymodel);
        ScaleMonster(self.scale, min_s, max_s);
 
        self.takedamage                 = DAMAGE_AIM;