Merge branch 'master' into terencehill/lms_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / sv_spawner.qc

diff --git a/qcsrc/common/monsters/sv_spawner.qc b/qcsrc/common/monsters/sv_spawner.qc
index d3f4ee740ab1543d2bf8fae2090e111842f251de..a430951da56ff891b08842bb1894d57fc1cf6850 100644 (file)
--- a/qcsrc/common/monsters/sv_spawner.qc
+++ b/qcsrc/common/monsters/sv_spawner.qc
@@ -1,5 +1,7 @@
 #include "sv_spawner.qh"
-#include "sv_spawn.qh"
+
+#include <common/monsters/sv_monsters.qh>
+#include <common/monsters/sv_spawn.qh>
 
 void spawner_use(entity this, entity actor, entity trigger)
 {
@@ -16,7 +18,8 @@ void spawner_use(entity this, entity actor, entity trigger)
        e.noalign = this.noalign;
        e.angles = this.angles;
        e.monster_skill = this.monster_skill;
-       e = spawnmonster(e, this.spawnmob, 0, this, this, this.origin, false, true, this.monster_moveflags);
+       e.skin = this.skin;
+       e = spawnmonster(e, this.spawnmob, MON_Null, this, this, this.origin, false, true, this.monster_moveflags);
 }
 
 spawnfunc(monster_spawner)