X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fmage.qc;h=f7ec0140857109434169b10fe0cfc55a393a9995;hp=4de03d7380018b83891f269a8b947ba0484690ed;hb=be91ef701b96453388cdcfb40f561281076ef52d;hpb=45419c41b4da92340152d6fffe1fa429769b6d6a diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index 4de03d738..f7ec01408 100644 --- a/qcsrc/common/monsters/monster/mage.qc +++ b/qcsrc/common/monsters/monster/mage.qc @@ -25,7 +25,7 @@ REGISTER_MONSTER(MAGE, NEW(Mage)) { #include "../../weapons/all.qh" CLASS(MageSpike, PortoLaunch) -/* flags */ ATTRIB(MageSpike, spawnflags, int, WEP_TYPE_OTHER); +/* flags */ ATTRIB(MageSpike, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN); /* impulse */ ATTRIB(MageSpike, impulse, int, 9); /* refname */ ATTRIB(MageSpike, netname, string, "magespike"); /* wepname */ ATTRIB(MageSpike, message, string, _("Mage spike")); @@ -40,7 +40,7 @@ REGISTER_WEAPON(MAGE_SPIKE, NEW(MageSpike)); void M_Mage_Attack_Spike(vector dir); void M_Mage_Attack_Push(); -METHOD(MageSpike, wr_think, bool(MageSpike thiswep, bool fire1, bool fire2)) { +METHOD(MageSpike, wr_think, void(MageSpike thiswep, bool fire1, bool fire2)) { SELFPARAM(); if (fire1) if (!IS_PLAYER(self) || weapon_prepareattack(false, 0.2)) { @@ -56,7 +56,6 @@ METHOD(MageSpike, wr_think, bool(MageSpike thiswep, bool fire1, bool fire2)) { M_Mage_Attack_Push(); weapon_thinkf(WFRAME_FIRE2, 0, w_ready); } - return true; } void M_Mage_Attack_Teleport();