X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_crylink.qc;h=08deaf78c4a81e5ade345c1e9fd8590e5fb194bf;hb=75d8c631b71daf6ad2019d8139771f00ad426d33;hp=d17826a9247908f7c1bceb42dcfc2d91645d585c;hpb=71e6c75bc408ae5a116f296797c49c0cef7be113;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index d17826a92..08deaf78c 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -1,4 +1,4 @@ -#ifdef REGISTER_WEAPON +#ifndef IMPLEMENTATION REGISTER_WEAPON( /* WEP_##id */ CRYLINK, /* function */ W_Crylink, @@ -9,7 +9,7 @@ REGISTER_WEAPON( /* color */ '1 0.5 1', /* modelname */ "crylink", /* simplemdl */ "foobar", -/* crosshair */ "gfx/crosshaircrylink 0.4", +/* crosshair */ "gfx/crosshaircrylink 0.5", /* wepimg */ "weaponcrylink", /* refname */ "crylink", /* wepname */ _("Crylink") @@ -61,9 +61,10 @@ CRYLINK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) .entity queuenext; .entity queueprev; #endif -#else +#endif +#ifdef IMPLEMENTATION #ifdef SVQC -void spawnfunc_weapon_crylink(void) { weapon_defaultspawnfunc(WEP_CRYLINK); } +void spawnfunc_weapon_crylink(void) { weapon_defaultspawnfunc(WEP_CRYLINK.m_id); } void W_Crylink_CheckLinks(entity e) { @@ -123,9 +124,9 @@ void W_Crylink_LinkExplode(entity e, entity e2) if(e == e.realowner.crylink_lastgroup) e.realowner.crylink_lastgroup = world; - + float isprimary = !(e.projectiledeathtype & HITTYPE_SECONDARY); - + RadiusDamage(e, e.realowner, WEP_CVAR_BOTH(crylink, isprimary, damage) * a, WEP_CVAR_BOTH(crylink, isprimary, edgedamage) * a, WEP_CVAR_BOTH(crylink, isprimary, radius), world, world, WEP_CVAR_BOTH(crylink, isprimary, force) * a, e.projectiledeathtype, other); W_Crylink_LinkExplode(e.queuenext, e2); @@ -241,7 +242,7 @@ void W_Crylink_LinkJoinEffect_Think(void) if(n >= 2) { float isprimary = !(e.projectiledeathtype & HITTYPE_SECONDARY); - + if(WEP_CVAR_BOTH(crylink, isprimary, joinexplode)) { n /= WEP_CVAR_BOTH(crylink, isprimary, shots); @@ -257,7 +258,7 @@ void W_Crylink_LinkJoinEffect_Think(void) e.projectiledeathtype, other ); - pointparticles(particleeffectnum("crylink_joinexplode"), self.origin, '0 0 0', n); + Send_Effect(EFFECT_CRYLINK_JOINEXPLODE, self.origin, '0 0 0', n); } } } @@ -266,7 +267,7 @@ void W_Crylink_LinkJoinEffect_Think(void) float W_Crylink_Touch_WouldHitFriendly(entity projectile, float rad) { - entity head = WarpZone_FindRadius((projectile.origin + (projectile.mins + projectile.maxs) * 0.5), rad + MAX_DAMAGEEXTRARADIUS, FALSE); + entity head = WarpZone_FindRadius((projectile.origin + (projectile.mins + projectile.maxs) * 0.5), rad + MAX_DAMAGEEXTRARADIUS, false); float hit_friendly = 0; float hit_enemy = 0; @@ -279,11 +280,11 @@ float W_Crylink_Touch_WouldHitFriendly(entity projectile, float rad) else ++hit_enemy; } - + head = head.chain; } - return (hit_enemy ? FALSE : hit_friendly); + return (hit_enemy ? false : hit_friendly); } // NO bounce protection, as bounces are limited! @@ -306,7 +307,7 @@ void W_Crylink_Touch(void) f *= a; float totaldamage = RadiusDamage(self, self.realowner, WEP_CVAR_BOTH(crylink, isprimary, damage) * f, WEP_CVAR_BOTH(crylink, isprimary, edgedamage) * f, WEP_CVAR_BOTH(crylink, isprimary, radius), world, world, WEP_CVAR_BOTH(crylink, isprimary, force) * f, self.projectiledeathtype, other); - + if(totaldamage && ((WEP_CVAR_BOTH(crylink, isprimary, linkexplode) == 2) || ((WEP_CVAR_BOTH(crylink, isprimary, linkexplode) == 1) && !W_Crylink_Touch_WouldHitFriendly(self, WEP_CVAR_BOTH(crylink, isprimary, radius))))) { if(self == self.realowner.crylink_lastgroup) @@ -329,7 +330,7 @@ void W_Crylink_Touch(void) self.projectiledeathtype |= HITTYPE_BOUNCE; // commented out as it causes a little hitch... //if(proj.cnt == 0) - // CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK, TRUE); + // CSQCProjectile(proj, true, PROJECTILE_CRYLINK, true); } void W_Crylink_Fadethink(void) @@ -353,13 +354,13 @@ void W_Crylink_Attack(void) if(WEP_CVAR_PRI(crylink, joinexplode)) maxdmg += WEP_CVAR_PRI(crylink, joinexplode_damage); - W_SetupShot(self, FALSE, 2, "weapons/crylink_fire.wav", CH_WEAPON_A, maxdmg); + W_SetupShot(self, false, 2, W_Sound("crylink_fire"), CH_WEAPON_A, maxdmg); forward = v_forward; right = v_right; up = v_up; shots = WEP_CVAR_PRI(crylink, shots); - pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots); + Send_Effect(EFFECT_CRYLINK_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, shots); proj = prevproj = firstproj = world; for(counter = 0; counter < shots; ++counter) { @@ -367,7 +368,7 @@ void W_Crylink_Attack(void) proj.reset = W_Crylink_Reset; proj.realowner = proj.owner = self; proj.classname = "spike"; - proj.bot_dodge = TRUE; + proj.bot_dodge = true; proj.bot_dodgerating = WEP_CVAR_PRI(crylink, damage); if(shots == 1) { proj.queuenext = proj; @@ -391,7 +392,7 @@ void W_Crylink_Attack(void) proj.movetype = MOVETYPE_BOUNCEMISSILE; PROJECTILE_MAKETRIGGER(proj); - proj.projectiledeathtype = WEP_CRYLINK; + proj.projectiledeathtype = WEP_CRYLINK.m_id; //proj.gravity = 0.001; setorigin(proj, w_shotorg); @@ -404,11 +405,11 @@ void W_Crylink_Attack(void) else { makevectors('0 360 0' * (0.75 + (counter - 0.5) / (shots - 1))); - s_y = v_forward_x; - s_z = v_forward_y; + s.y = v_forward.x; + s.z = v_forward.y; } s = s * WEP_CVAR_PRI(crylink, spread) * g_weaponspreadfactor; - W_SetupProjVelocity_Explicit(proj, w_shotdir + right * s_y + up * s_z, v_up, WEP_CVAR_PRI(crylink, speed), 0, 0, 0, FALSE); + W_SetupProjVelocity_Explicit(proj, w_shotdir + right * s.y + up * s.z, v_up, WEP_CVAR_PRI(crylink, speed), 0, 0, 0, false); proj.touch = W_Crylink_Touch; proj.think = W_Crylink_Fadethink; @@ -434,10 +435,10 @@ void W_Crylink_Attack(void) proj.flags = FL_PROJECTILE; proj.missile_flags = MIF_SPLASH; - - CSQCProjectile(proj, TRUE, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), TRUE); - other = proj; MUTATOR_CALLHOOK(EditProjectile); + CSQCProjectile(proj, true, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), true); + + MUTATOR_CALLHOOK(EditProjectile, self, proj); } if(WEP_CVAR_PRI(crylink, joinspread) != 0) { @@ -462,13 +463,13 @@ void W_Crylink_Attack2(void) if(WEP_CVAR_SEC(crylink, joinexplode)) maxdmg += WEP_CVAR_SEC(crylink, joinexplode_damage); - W_SetupShot(self, FALSE, 2, "weapons/crylink_fire2.wav", CH_WEAPON_A, maxdmg); + W_SetupShot(self, false, 2, W_Sound("crylink_fire2"), CH_WEAPON_A, maxdmg); forward = v_forward; right = v_right; up = v_up; shots = WEP_CVAR_SEC(crylink, shots); - pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots); + Send_Effect(EFFECT_CRYLINK_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, shots); proj = prevproj = firstproj = world; for(counter = 0; counter < shots; ++counter) { @@ -476,7 +477,7 @@ void W_Crylink_Attack2(void) proj.reset = W_Crylink_Reset; proj.realowner = proj.owner = self; proj.classname = "spike"; - proj.bot_dodge = TRUE; + proj.bot_dodge = true; proj.bot_dodgerating = WEP_CVAR_SEC(crylink, damage); if(shots == 1) { proj.queuenext = proj; @@ -500,7 +501,7 @@ void W_Crylink_Attack2(void) proj.movetype = MOVETYPE_BOUNCEMISSILE; PROJECTILE_MAKETRIGGER(proj); - proj.projectiledeathtype = WEP_CRYLINK | HITTYPE_SECONDARY; + proj.projectiledeathtype = WEP_CRYLINK.m_id | HITTYPE_SECONDARY; //proj.gravity = 0.001; setorigin(proj, w_shotorg); @@ -514,18 +515,18 @@ void W_Crylink_Attack2(void) else { makevectors('0 360 0' * (0.75 + (counter - 0.5) / (shots - 1))); - s_y = v_forward_x; - s_z = v_forward_y; + s.y = v_forward.x; + s.z = v_forward.y; } s = s * WEP_CVAR_SEC(crylink, spread) * g_weaponspreadfactor; - s = w_shotdir + right * s_y + up * s_z; + s = w_shotdir + right * s.y + up * s.z; } else { s = (w_shotdir + (((counter + 0.5) / shots) * 2 - 1) * v_right * WEP_CVAR_SEC(crylink, spread) * g_weaponspreadfactor); } - W_SetupProjVelocity_Explicit(proj, s, v_up, WEP_CVAR_SEC(crylink, speed), 0, 0, 0, FALSE); + W_SetupProjVelocity_Explicit(proj, s, v_up, WEP_CVAR_SEC(crylink, speed), 0, 0, 0, false); proj.touch = W_Crylink_Touch; proj.think = W_Crylink_Fadethink; if(counter == (shots - 1) / 2) @@ -550,10 +551,10 @@ void W_Crylink_Attack2(void) proj.flags = FL_PROJECTILE; proj.missile_flags = MIF_SPLASH; - - CSQCProjectile(proj, TRUE, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), TRUE); - other = proj; MUTATOR_CALLHOOK(EditProjectile); + CSQCProjectile(proj, true, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), true); + + MUTATOR_CALLHOOK(EditProjectile, self, proj); } if(WEP_CVAR_SEC(crylink, joinspread) != 0) { @@ -563,7 +564,7 @@ void W_Crylink_Attack2(void) } } -float W_Crylink(float req) +bool W_Crylink(int req) { float ammo_amount; switch(req) @@ -571,11 +572,11 @@ float W_Crylink(float req) case WR_AIM: { if(random() < 0.10) - self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(crylink, speed), 0, WEP_CVAR_PRI(crylink, middle_lifetime), FALSE); + self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(crylink, speed), 0, WEP_CVAR_PRI(crylink, middle_lifetime), false); else - self.BUTTON_ATCK2 = bot_aim(WEP_CVAR_SEC(crylink, speed), 0, WEP_CVAR_SEC(crylink, middle_lifetime), FALSE); - - return TRUE; + self.BUTTON_ATCK2 = bot_aim(WEP_CVAR_SEC(crylink, speed), 0, WEP_CVAR_SEC(crylink, middle_lifetime), false); + + return true; } case WR_THINK: { @@ -612,7 +613,7 @@ float W_Crylink(float req) vector pos; entity linkjoineffect; float isprimary = (self.crylink_waitrelease == 1); - + pos = W_Crylink_LinkJoin(self.crylink_lastgroup, WEP_CVAR_BOTH(crylink, isprimary, joinspread) * WEP_CVAR_BOTH(crylink, isprimary, speed)); linkjoineffect = spawn(); @@ -627,54 +628,54 @@ float W_Crylink(float req) if(!(self.items & IT_UNLIMITED_WEAPON_AMMO)) { // ran out of ammo! - self.cnt = WEP_CRYLINK; + self.cnt = WEP_CRYLINK.m_id; self.switchweapon = w_getbestweapon(self); } } } - - return TRUE; + + return true; } case WR_INIT: { - precache_model("models/weapons/g_crylink.md3"); - precache_model("models/weapons/v_crylink.md3"); - precache_model("models/weapons/h_crylink.iqm"); - precache_sound("weapons/crylink_fire.wav"); - precache_sound("weapons/crylink_fire2.wav"); - precache_sound("weapons/crylink_linkjoin.wav"); - CRYLINK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) - return TRUE; + precache_model(W_Model("g_crylink.md3")); + precache_model(W_Model("v_crylink.md3")); + precache_model(W_Model("h_crylink.iqm")); + precache_sound(W_Sound("crylink_fire")); + precache_sound(W_Sound("crylink_fire2")); + precache_sound(W_Sound("crylink_linkjoin")); + CRYLINK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP); + return true; } case WR_CHECKAMMO1: { // don't "run out of ammo" and switch weapons while waiting for release if(self.crylink_lastgroup && self.crylink_waitrelease) - return TRUE; + return true; ammo_amount = self.WEP_AMMO(CRYLINK) >= WEP_CVAR_PRI(crylink, ammo); - ammo_amount += self.(weapon_load[WEP_CRYLINK]) >= WEP_CVAR_PRI(crylink, ammo); + ammo_amount += self.(weapon_load[WEP_CRYLINK.m_id]) >= WEP_CVAR_PRI(crylink, ammo); return ammo_amount; } case WR_CHECKAMMO2: { // don't "run out of ammo" and switch weapons while waiting for release if(self.crylink_lastgroup && self.crylink_waitrelease) - return TRUE; + return true; ammo_amount = self.WEP_AMMO(CRYLINK) >= WEP_CVAR_SEC(crylink, ammo); - ammo_amount += self.(weapon_load[WEP_CRYLINK]) >= WEP_CVAR_SEC(crylink, ammo); + ammo_amount += self.(weapon_load[WEP_CRYLINK.m_id]) >= WEP_CVAR_SEC(crylink, ammo); return ammo_amount; } case WR_CONFIG: { - CRYLINK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS) - return TRUE; + CRYLINK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS); + return true; } case WR_RELOAD: { - W_Reload(min(WEP_CVAR_PRI(crylink, ammo), WEP_CVAR_SEC(crylink, ammo)), "weapons/reload.wav"); - return TRUE; + W_Reload(min(WEP_CVAR_PRI(crylink, ammo), WEP_CVAR_SEC(crylink, ammo)), W_Sound("reload")); + return true; } case WR_SUICIDEMESSAGE: { @@ -685,11 +686,11 @@ float W_Crylink(float req) return WEAPON_CRYLINK_MURDER; } } - return FALSE; + return false; } #endif #ifdef CSQC -float W_Crylink(float req) +bool W_Crylink(int req) { switch(req) { @@ -699,32 +700,32 @@ float W_Crylink(float req) org2 = w_org + w_backoff * 2; if(w_deathtype & HITTYPE_SECONDARY) { - pointparticles(particleeffectnum("crylink_impact"), org2, '0 0 0', 1); + pointparticles(particleeffectnum(EFFECT_CRYLINK_IMPACT2), org2, '0 0 0', 1); if(!w_issilent) - sound(self, CH_SHOTS, "weapons/crylink_impact2.wav", VOL_BASE, ATTN_NORM); + sound(self, CH_SHOTS, W_Sound("crylink_impact2"), VOL_BASE, ATTN_NORM); } else { - pointparticles(particleeffectnum("crylink_impactbig"), org2, '0 0 0', 1); + pointparticles(particleeffectnum(EFFECT_CRYLINK_IMPACT), org2, '0 0 0', 1); if(!w_issilent) - sound(self, CH_SHOTS, "weapons/crylink_impact.wav", VOL_BASE, ATTN_NORM); + sound(self, CH_SHOTS, W_Sound("crylink_impact"), VOL_BASE, ATTN_NORM); } - - return TRUE; + + return true; } case WR_INIT: { - precache_sound("weapons/crylink_impact2.wav"); - precache_sound("weapons/crylink_impact.wav"); - return TRUE; + precache_sound(W_Sound("crylink_impact2")); + precache_sound(W_Sound("crylink_impact")); + return true; } case WR_ZOOMRETICLE: { // no weapon specific image for this weapon - return FALSE; + return false; } } - return FALSE; + return false; } #endif #endif