X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_hlac.qc;h=e9c7ffee4802185c99108c547bcfb64cbc4c5113;hb=6213aa0e9f5b5a9fcbc95062ae081788dd29d68e;hp=d3dbed2f9c9fd9a88d974d227c378460016570b4;hpb=28931c8069eb1d283f01a26f31ad91d921294d9c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc
index d3dbed2f9..e9c7ffee4 100644
--- a/qcsrc/common/weapons/w_hlac.qc
+++ b/qcsrc/common/weapons/w_hlac.qc
@@ -56,9 +56,9 @@ void W_HLAC_Touch(void)
 	PROJECTILE_TOUCH;
 
 	self.event_damage = func_null;
-	
+
 	isprimary = !(self.projectiledeathtype & HITTYPE_SECONDARY);
-	
+
 	RadiusDamage(self, self.realowner, WEP_CVAR_BOTH(hlac, isprimary, damage), WEP_CVAR_BOTH(hlac, isprimary, edgedamage), WEP_CVAR_BOTH(hlac, isprimary, radius), world, world, WEP_CVAR_BOTH(hlac, isprimary, force), self.projectiledeathtype, other);
 
 	remove(self);
@@ -76,7 +76,7 @@ void W_HLAC_Attack(void)
     if(self.crouch)
         spread = spread * WEP_CVAR_PRI(hlac, spread_crouchmod);
 
-	W_SetupShot(self, FALSE, 3, "weapons/lasergun_fire.wav", CH_WEAPON_A, WEP_CVAR_PRI(hlac, damage));
+	W_SetupShot(self, false, 3, "weapons/lasergun_fire.wav", CH_WEAPON_A, WEP_CVAR_PRI(hlac, damage));
 	pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 	if(!autocvar_g_norecoil)
 	{
@@ -87,7 +87,7 @@ void W_HLAC_Attack(void)
 	missile = spawn();
 	missile.owner = missile.realowner = self;
 	missile.classname = "hlacbolt";
-	missile.bot_dodge = TRUE;
+	missile.bot_dodge = true;
 
     missile.bot_dodgerating = WEP_CVAR_PRI(hlac, damage);
 
@@ -108,9 +108,9 @@ void W_HLAC_Attack(void)
 	missile.flags = FL_PROJECTILE;
 	missile.projectiledeathtype = WEP_HLAC;
 
-	CSQCProjectile(missile, TRUE, PROJECTILE_HLAC, TRUE);
+	CSQCProjectile(missile, true, PROJECTILE_HLAC, true);
 
-	other = missile; MUTATOR_CALLHOOK(EditProjectile);
+	MUTATOR_CALLHOOK(EditProjectile, self, missile);
 }
 
 void W_HLAC_Attack2(void)
@@ -124,13 +124,13 @@ void W_HLAC_Attack2(void)
     if(self.crouch)
         spread = spread * WEP_CVAR_SEC(hlac, spread_crouchmod);
 
-	W_SetupShot(self, FALSE, 3, "weapons/lasergun_fire.wav", CH_WEAPON_A, WEP_CVAR_SEC(hlac, damage));
+	W_SetupShot(self, false, 3, "weapons/lasergun_fire.wav", CH_WEAPON_A, WEP_CVAR_SEC(hlac, damage));
 	pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
 	missile = spawn();
 	missile.owner = missile.realowner = self;
 	missile.classname = "hlacbolt";
-	missile.bot_dodge = TRUE;
+	missile.bot_dodge = true;
 
     missile.bot_dodgerating = WEP_CVAR_SEC(hlac, damage);
 
@@ -149,12 +149,12 @@ void W_HLAC_Attack2(void)
     missile.nextthink = time + WEP_CVAR_SEC(hlac, lifetime);
 
 	missile.flags = FL_PROJECTILE;
-	missile.missile_flags = MIF_SPLASH; 
+	missile.missile_flags = MIF_SPLASH;
 	missile.projectiledeathtype = WEP_HLAC | HITTYPE_SECONDARY;
 
-	CSQCProjectile(missile, TRUE, PROJECTILE_HLAC, TRUE);
+	CSQCProjectile(missile, true, PROJECTILE_HLAC, true);
 
-	other = missile; MUTATOR_CALLHOOK(EditProjectile);
+	MUTATOR_CALLHOOK(EditProjectile, self, missile);
 }
 
 // weapon frames
@@ -203,15 +203,15 @@ void W_HLAC_Attack2_Frame(void)
 	}
 }
 
-float W_HLAC(float req)
+bool W_HLAC(int req)
 {
 	float ammo_amount;
 	switch(req)
 	{
 		case WR_AIM:
 		{
-			self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(hlac, speed), 0, WEP_CVAR_PRI(hlac, lifetime), FALSE);
-			return TRUE;
+			self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(hlac, speed), 0, WEP_CVAR_PRI(hlac, lifetime), false);
+			return true;
 		}
 		case WR_THINK:
 		{
@@ -235,8 +235,8 @@ float W_HLAC(float req)
 					weapon_thinkf(WFRAME_FIRE2, WEP_CVAR_SEC(hlac, animtime), w_ready);
 				}
 			}
-			
-			return TRUE;
+
+			return true;
 		}
 		case WR_INIT:
 		{
@@ -244,8 +244,8 @@ float W_HLAC(float req)
 			precache_model("models/weapons/v_hlac.md3");
 			precache_model("models/weapons/h_hlac.iqm");
 			precache_sound("weapons/lasergun_fire.wav");
-			HLAC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
-			return TRUE;
+			HLAC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
+			return true;
 		}
 		case WR_CHECKAMMO1:
 		{
@@ -261,13 +261,13 @@ float W_HLAC(float req)
 		}
 		case WR_CONFIG:
 		{
-			HLAC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
-			return TRUE;
+			HLAC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
+			return true;
 		}
 		case WR_RELOAD:
 		{
 			W_Reload(min(WEP_CVAR_PRI(hlac, ammo), WEP_CVAR_SEC(hlac, ammo)), "weapons/reload.wav");
-			return TRUE;
+			return true;
 		}
 		case WR_SUICIDEMESSAGE:
 		{
@@ -278,11 +278,11 @@ float W_HLAC(float req)
 			return WEAPON_HLAC_MURDER;
 		}
 	}
-	return FALSE;
+	return false;
 }
 #endif
 #ifdef CSQC
-float W_HLAC(float req)
+bool W_HLAC(int req)
 {
 	switch(req)
 	{
@@ -293,21 +293,21 @@ float W_HLAC(float req)
 			pointparticles(particleeffectnum("laser_impact"), org2, w_backoff * 1000, 1);
 			if(!w_issilent)
 				sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
-				
-			return TRUE;
+
+			return true;
 		}
 		case WR_INIT:
 		{
 			precache_sound("weapons/laserimpact.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