Merge branch 'Goodspeed/Naitlee/ChineseLocalizationUpdate' into 'master'

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

diff --git a/qcsrc/common/monsters/monster/golem.qc b/qcsrc/common/monsters/monster/golem.qc
index 9a181386f7c64fb2e73208ac6a10f1d5f7ec52ab..8762dd9e4253ce2a28e5792a82cc67f0331ccaeb 100644 (file)
--- a/qcsrc/common/monsters/monster/golem.qc
+++ b/qcsrc/common/monsters/monster/golem.qc
@@ -18,18 +18,6 @@ float autocvar_g_monster_golem_speed_stop;
 float autocvar_g_monster_golem_speed_run;
 float autocvar_g_monster_golem_speed_walk;
 
-/*
-const float golem_anim_stand           = 0;
-const float golem_anim_walk            = 1;
-const float golem_anim_run             = 2;
-const float golem_anim_smash           = 3;
-const float golem_anim_swingr  = 4;
-const float golem_anim_swingl  = 5;
-const float golem_anim_magic           = 6;
-const float golem_anim_pain            = 7;
-const float golem_anim_death           = 8;
-*/
-
 .float golem_lastattack; // delay attacks separately
 
 void M_Golem_Attack_Smash(entity this)
@@ -209,7 +197,7 @@ bool M_Golem_Attack(int attack_type, entity actor, entity targ, .entity weaponen
        return false;
 }
 
-spawnfunc(monster_golem) { Monster_Spawn(this, true, MON_GOLEM.monsterid); }
+spawnfunc(monster_golem) { Monster_Spawn(this, true, MON_GOLEM); }
 // compatibility
 spawnfunc(monster_shambler) { spawnfunc_monster_golem(this); }
 #endif // SVQC
@@ -286,7 +274,7 @@ METHOD(Golem, mr_setup, bool(Golem this, entity actor))
 
     setanim(actor, actor.anim_spawn, false, true, true);
     actor.spawn_time = actor.animstate_endtime;
-    actor.spawnshieldtime = actor.spawn_time;
+    StatusEffects_apply(STATUSEFFECT_SpawnShield, actor, actor.spawn_time, 0);
     actor.monster_attackfunc = M_Golem_Attack;
 
     return true;