Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / func / breakable.qc

diff --git a/qcsrc/common/mapobjects/func/breakable.qc b/qcsrc/common/mapobjects/func/breakable.qc
index cb17ac442cb4244aa71b708e6c7c27deaf220bb4..d49f210784c589988e80700146bcfeb0f7735022 100644 (file)
--- a/qcsrc/common/mapobjects/func/breakable.qc
+++ b/qcsrc/common/mapobjects/func/breakable.qc
@@ -355,6 +355,7 @@ spawnfunc(func_breakable)
                this.takedamage = DAMAGE_NO;
                this.event_damage = func_null;
                this.bot_attack = false;
+               this.monster_attack = false;
        }
 
        // precache all the models
@@ -375,6 +376,9 @@ spawnfunc(func_breakable)
        this.reset = func_breakable_reset;
        this.reset(this);
 
+       if(this.monster_attack)
+               IL_PUSH(g_monster_targets, this);
+
        IL_PUSH(g_initforplayer, this);
        this.init_for_player = func_breakable_init_for_player;