X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_fireball.qc;h=d0980091353b01615c9475f8ec9fd1caa1ee0736;hb=c36125569f424bea49b14873f7235e220b5806ef;hp=a5bca22cd16ac1e3cadd9bfa734383f4c19a9cb6;hpb=0a92453278b65a165e83e64a989b5e7de38ccf02;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc index a5bca22cd..d09800913 100644 --- a/qcsrc/common/weapons/w_fireball.qc +++ b/qcsrc/common/weapons/w_fireball.qc @@ -122,13 +122,13 @@ void W_Fireball_LaserPlay(float dt, float dist, float damage, float edgedamage, return; RandomSelection_Init(); - for(e = WarpZone_FindRadius(self.origin, dist, TRUE); e; e = e.chain) + for(e = WarpZone_FindRadius(self.origin, dist, true); e; e = e.chain) if(e != self.realowner) if(e.takedamage == DAMAGE_AIM) if(!IS_PLAYER(e) || !self.realowner || DIFF_TEAM(e, self)) { p = e.origin; - p_x += e.mins_x + random() * (e.maxs_x - e.mins_x); - p_y += e.mins_y + random() * (e.maxs_y - e.mins_y); - p_z += e.mins_z + random() * (e.maxs_z - e.mins_z); + p.x += e.mins.x + random() * (e.maxs.x - e.mins.x); + p.y += e.mins.y + random() * (e.maxs.y - e.mins.y); + p.z += e.mins.z + random() * (e.maxs.z - e.mins.z); d = vlen(WarpZone_UnTransformOrigin(e, self.origin) - p); if(d < dist) { @@ -181,14 +181,14 @@ void W_Fireball_Attack1(void) { entity proj; - W_SetupShot_ProjectileSize(self, '-16 -16 -16', '16 16 16', FALSE, 2, "weapons/fireball_fire2.wav", CH_WEAPON_A, WEP_CVAR_PRI(fireball, damage) + WEP_CVAR_PRI(fireball, bfgdamage)); + W_SetupShot_ProjectileSize(self, '-16 -16 -16', '16 16 16', false, 2, "weapons/fireball_fire2.wav", CH_WEAPON_A, WEP_CVAR_PRI(fireball, damage) + WEP_CVAR_PRI(fireball, bfgdamage)); pointparticles(particleeffectnum("fireball_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); proj = spawn(); proj.classname = "plasma_prim"; proj.owner = proj.realowner = self; - proj.bot_dodge = TRUE; + proj.bot_dodge = true; proj.bot_dodgerating = WEP_CVAR_PRI(fireball, damage); proj.pushltime = time + WEP_CVAR_PRI(fireball, lifetime); proj.use = W_Fireball_Explode; @@ -211,15 +211,15 @@ void W_Fireball_Attack1(void) proj.flags = FL_PROJECTILE; proj.missile_flags = MIF_SPLASH | MIF_PROXY; - CSQCProjectile(proj, TRUE, PROJECTILE_FIREBALL, TRUE); + CSQCProjectile(proj, true, PROJECTILE_FIREBALL, true); other = proj; MUTATOR_CALLHOOK(EditProjectile); } void W_Fireball_AttackEffect(float i, vector f_diff) { - W_SetupShot_ProjectileSize(self, '-16 -16 -16', '16 16 16', FALSE, 0, "", 0, 0); - w_shotorg += f_diff_x * v_up + f_diff_y * v_right; + W_SetupShot_ProjectileSize(self, '-16 -16 -16', '16 16 16', false, 0, "", 0, 0); + w_shotorg += f_diff.x * v_up + f_diff.y * v_right; pointparticles(particleeffectnum("fireball_preattack_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); } @@ -298,7 +298,7 @@ void W_Fireball_Attack2(void) vector f_diff; float c; - c = mod(self.bulletcounter, 4); + c = self.bulletcounter % 4; switch(c) { case 0: @@ -315,8 +315,8 @@ void W_Fireball_Attack2(void) f_diff = '+1.25 +3.75 0'; break; } - W_SetupShot_ProjectileSize(self, '-4 -4 -4', '4 4 4', FALSE, 2, "weapons/fireball_fire.wav", CH_WEAPON_A, WEP_CVAR_SEC(fireball, damage)); - traceline(w_shotorg, w_shotorg + f_diff_x * v_up + f_diff_y * v_right, MOVE_NORMAL, self); + W_SetupShot_ProjectileSize(self, '-4 -4 -4', '4 4 4', false, 2, "weapons/fireball_fire.wav", CH_WEAPON_A, WEP_CVAR_SEC(fireball, damage)); + traceline(w_shotorg, w_shotorg + f_diff.x * v_up + f_diff.y * v_right, MOVE_NORMAL, self); w_shotorg = trace_endpos; pointparticles(particleeffectnum("fireball_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); @@ -324,7 +324,7 @@ void W_Fireball_Attack2(void) proj = spawn(); proj.owner = proj.realowner = self; proj.classname = "grenade"; - proj.bot_dodge = TRUE; + proj.bot_dodge = true; proj.bot_dodgerating = WEP_CVAR_SEC(fireball, damage); proj.movetype = MOVETYPE_BOUNCE; proj.projectiledeathtype = WEP_FIREBALL | HITTYPE_SECONDARY; @@ -342,7 +342,7 @@ void W_Fireball_Attack2(void) proj.flags = FL_PROJECTILE; proj.missile_flags = MIF_SPLASH | MIF_PROXY | MIF_ARC; - CSQCProjectile(proj, TRUE, PROJECTILE_FIREMINE, TRUE); + CSQCProjectile(proj, true, PROJECTILE_FIREMINE, true); other = proj; MUTATOR_CALLHOOK(EditProjectile); } @@ -353,26 +353,26 @@ float W_Fireball(float req) { case WR_AIM: { - self.BUTTON_ATCK = FALSE; - self.BUTTON_ATCK2 = FALSE; + self.BUTTON_ATCK = false; + self.BUTTON_ATCK2 = false; if(self.bot_primary_fireballmooth == 0) { - if(bot_aim(WEP_CVAR_PRI(fireball, speed), 0, WEP_CVAR_PRI(fireball, lifetime), FALSE)) + if(bot_aim(WEP_CVAR_PRI(fireball, speed), 0, WEP_CVAR_PRI(fireball, lifetime), false)) { - self.BUTTON_ATCK = TRUE; + self.BUTTON_ATCK = true; if(random() < 0.02) self.bot_primary_fireballmooth = 0; } } else { - if(bot_aim(WEP_CVAR_SEC(fireball, speed), WEP_CVAR_SEC(fireball, speed_up), WEP_CVAR_SEC(fireball, lifetime), TRUE)) + if(bot_aim(WEP_CVAR_SEC(fireball, speed), WEP_CVAR_SEC(fireball, speed_up), WEP_CVAR_SEC(fireball, lifetime), true)) { - self.BUTTON_ATCK2 = TRUE; + self.BUTTON_ATCK2 = true; if(random() < 0.01) self.bot_primary_fireballmooth = 1; } } - - return TRUE; + + return true; } case WR_THINK: { @@ -393,8 +393,8 @@ float W_Fireball(float req) weapon_thinkf(WFRAME_FIRE2, WEP_CVAR_SEC(fireball, animtime), w_ready); } } - - return TRUE; + + return true; } case WR_INIT: { @@ -405,28 +405,28 @@ float W_Fireball(float req) precache_sound("weapons/fireball_fire.wav"); precache_sound("weapons/fireball_fire2.wav"); precache_sound("weapons/fireball_prefire2.wav"); - FIREBALL_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) - return TRUE; + FIREBALL_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP); + return true; } case WR_SETUP: { self.ammo_field = ammo_none; - return TRUE; + return true; } case WR_CHECKAMMO1: case WR_CHECKAMMO2: { - return TRUE; // fireball has infinite ammo + return true; // fireball has infinite ammo } case WR_CONFIG: { - FIREBALL_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS) - return TRUE; + FIREBALL_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS); + return true; } case WR_RESETPLAYER: { self.fireball_primarytime = time; - return TRUE; + return true; } case WR_SUICIDEMESSAGE: { @@ -443,7 +443,7 @@ float W_Fireball(float req) return WEAPON_FIREBALL_MURDER_BLAST; } } - return FALSE; + return false; } #endif #ifdef CSQC @@ -465,21 +465,21 @@ float W_Fireball(float req) if(!w_issilent) sound(self, CH_SHOTS, "weapons/fireball_impact2.wav", VOL_BASE, ATTEN_NORM * 0.25); // long range boom } - - return TRUE; + + return true; } case WR_INIT: { precache_sound("weapons/fireball_impact2.wav"); - return TRUE; + return true; } case WR_ZOOMRETICLE: { // no weapon specific image for this weapon - return FALSE; + return false; } } - return FALSE; + return false; } #endif #endif