X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_hook.qc;h=8ea84912aa58257abd2d003238c78d197b963b01;hb=845401fd312c66c059aaee1772ac5d79555ab4fc;hp=ca94ace96e1cfe6ea1bcb87d8200ef0ffc04c673;hpb=014e27ddc7d207bd3ffe09a5d966f969e4a50712;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc
index ca94ace96..8ea84912a 100644
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -38,7 +38,8 @@ REGISTER_WEAPON(
 	w_prop(id, sn, float,  switchdelay_drop, switchdelay_drop) \
 	w_prop(id, sn, string, weaponreplace, weaponreplace) \
 	w_prop(id, sn, float,  weaponstart, weaponstart) \
-	w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride)
+	w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride) \
+	w_prop(id, sn, float,  weaponthrowable, weaponthrowable)
 
 #ifdef SVQC
 HOOK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
@@ -57,18 +58,18 @@ HOOK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
 #else
 #ifdef SVQC
 
-void spawnfunc_weapon_hook()
+void spawnfunc_weapon_hook(void)
 {
 	if(g_grappling_hook) // offhand hook
 	{
-		startitem_failed = TRUE;
+		startitem_failed = true;
 		remove(self);
 		return;
 	}
 	weapon_defaultspawnfunc(WEP_HOOK);
 }
 
-void W_Hook_ExplodeThink (void)
+void W_Hook_ExplodeThink(void)
 {
 	float dt, dmg_remaining_next, f;
 
@@ -78,9 +79,9 @@ void W_Hook_ExplodeThink (void)
 	f = self.dmg_last - dmg_remaining_next;
 	self.dmg_last = dmg_remaining_next;
 
-	RadiusDamage (self, self.realowner, self.dmg * f, self.dmg_edge * f, self.dmg_radius, self.realowner, world, self.dmg_force * f, self.projectiledeathtype, world);
+	RadiusDamage(self, self.realowner, self.dmg * f, self.dmg_edge * f, self.dmg_radius, self.realowner, world, self.dmg_force * f, self.projectiledeathtype, world);
 	self.projectiledeathtype |= HITTYPE_BOUNCE;
-	//RadiusDamage (self, world, self.dmg * f, self.dmg_edge * f, self.dmg_radius, world, world, self.dmg_force * f, self.projectiledeathtype, world);
+	//RadiusDamage(self, world, self.dmg * f, self.dmg_edge * f, self.dmg_radius, world, world, self.dmg_force * f, self.projectiledeathtype, world);
 
 	if(dt < self.dmg_duration)
 		self.nextthink = time + 0.05; // soon
@@ -88,7 +89,7 @@ void W_Hook_ExplodeThink (void)
 		remove(self);
 }
 
-void W_Hook_Explode2 (void)
+void W_Hook_Explode2(void)
 {
 	self.event_damage = func_null;
 	self.touch = func_null;
@@ -107,37 +108,37 @@ void W_Hook_Explode2 (void)
 	self.movetype = MOVETYPE_NONE;
 }
 
-void W_Hook_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void W_Hook_Damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
-	if (self.health <= 0)
+	if(self.health <= 0)
 		return;
 		
-	if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions
+	if(!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions
 		return; // g_projectiles_damage says to halt	
 	
 	self.health = self.health - damage;
 	
-	if (self.health <= 0)
+	if(self.health <= 0)
 		W_PrepareExplosionByDamage(self.realowner, W_Hook_Explode2);
 }
 
-void W_Hook_Touch2 (void)
+void W_Hook_Touch2(void)
 {
 	PROJECTILE_TOUCH;
 	self.use();
 }
 
-void W_Hook_Attack2()
+void W_Hook_Attack2(void)
 {
 	entity gren;
 
 	//W_DecreaseAmmo(WEP_CVAR_SEC(hook, ammo)); // WEAPONTODO: Figure out how to handle ammo with hook secondary (gravitybomb)
-	W_SetupShot (self, FALSE, 4, "weapons/hookbomb_fire.wav", CH_WEAPON_A, WEP_CVAR_SEC(hook, damage));
+	W_SetupShot(self, false, 4, "weapons/hookbomb_fire.wav", CH_WEAPON_A, WEP_CVAR_SEC(hook, damage));
 
-	gren = spawn ();
+	gren = spawn();
 	gren.owner = gren.realowner = self;
 	gren.classname = "hookbomb";
-	gren.bot_dodge = TRUE;
+	gren.bot_dodge = true;
 	gren.bot_dodgerating = WEP_CVAR_SEC(hook, damage);
 	gren.movetype = MOVETYPE_TOSS;
 	PROJECTILE_MAKETRIGGER(gren);
@@ -154,7 +155,7 @@ void W_Hook_Attack2()
 	gren.health = WEP_CVAR_SEC(hook, health);
 	gren.damageforcescale = WEP_CVAR_SEC(hook, damageforcescale);
 	gren.event_damage = W_Hook_Damage;
-	gren.damagedbycontents = TRUE;
+	gren.damagedbycontents = true;
 	gren.missile_flags = MIF_SPLASH | MIF_ARC;
 
 	gren.velocity = '0 0 1' * WEP_CVAR_SEC(hook, speed);
@@ -167,7 +168,7 @@ void W_Hook_Attack2()
 	gren.angles = '0 0 0';
 	gren.flags = FL_PROJECTILE;
 
-	CSQCProjectile(gren, TRUE, PROJECTILE_HOOKBOMB, TRUE);
+	CSQCProjectile(gren, true, PROJECTILE_HOOKBOMB, true);
 
 	other = gren; MUTATOR_CALLHOOK(EditProjectile);
 }
@@ -181,17 +182,17 @@ float W_Hook(float req)
 		case WR_AIM:
 		{
 			// no bot AI for hook (yet?)
-			return TRUE;
+			return true;
 		}
 		case WR_THINK:
 		{
-			if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK))
+			if(self.BUTTON_ATCK || self.BUTTON_HOOK)
 			{
 				if(!self.hook)
 				if(!(self.hook_state & HOOK_WAITING_FOR_RELEASE))
 				if(!(self.hook_state & HOOK_FIRING))
-				if (time > self.hook_refire)
-				if (weapon_prepareattack(0, -1))
+				if(time > self.hook_refire)
+				if(weapon_prepareattack(0, -1))
 				{
 					W_DecreaseAmmo(WEP_CVAR_PRI(hook, ammo));
 					self.hook_state |= HOOK_FIRING;
@@ -199,9 +200,9 @@ float W_Hook(float req)
 				}
 			}
 
-			if (self.BUTTON_ATCK2)
+			if(self.BUTTON_ATCK2)
 			{
-				if (weapon_prepareattack(1, WEP_CVAR_SEC(hook, refire)))
+				if(weapon_prepareattack(1, WEP_CVAR_SEC(hook, refire)))
 				{
 					W_Hook_Attack2();
 					weapon_thinkf(WFRAME_FIRE2, WEP_CVAR_SEC(hook, animtime), w_ready);
@@ -221,20 +222,20 @@ float W_Hook(float req)
 			if(self.hook && self.hook.state == 1)
 			{
 				hooked_time_max = WEP_CVAR_PRI(hook, hooked_time_max);			
-				if (hooked_time_max > 0)
+				if(hooked_time_max > 0)
 				{
-					if ( time > self.hook_time_hooked + hooked_time_max )
+					if( time > self.hook_time_hooked + hooked_time_max )
 						self.hook_state |= HOOK_REMOVING;
 				}
 				
 				hooked_fuel = WEP_CVAR_PRI(hook, hooked_ammo);
-				if (hooked_fuel > 0)
+				if(hooked_fuel > 0)
 				{
-					if ( time > self.hook_time_fueldecrease )
+					if( time > self.hook_time_fueldecrease )
 					{
 						if(!(self.items & IT_UNLIMITED_WEAPON_AMMO))
 						{
-							if ( self.ammo_fuel >= (time - self.hook_time_fueldecrease) * hooked_fuel )
+							if( self.ammo_fuel >= (time - self.hook_time_fueldecrease) * hooked_fuel )
 							{
 								W_DecreaseAmmo((time - self.hook_time_fueldecrease) * hooked_fuel);
 								self.hook_time_fueldecrease = time;
@@ -256,10 +257,10 @@ float W_Hook(float req)
 				self.hook_time_fueldecrease = time + WEP_CVAR_PRI(hook, hooked_time_free);
 			}
 
-			if (self.BUTTON_CROUCH)
+			if(self.BUTTON_CROUCH)
 			{
 				self.hook_state &= ~HOOK_PULLING;
-				if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK))
+				if(self.BUTTON_ATCK || self.BUTTON_HOOK)
 					self.hook_state &= ~HOOK_RELEASING;
 				else
 					self.hook_state |= HOOK_RELEASING;
@@ -269,7 +270,7 @@ float W_Hook(float req)
 				self.hook_state |= HOOK_PULLING;
 				self.hook_state &= ~HOOK_RELEASING;
 
-				if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK))
+				if(self.BUTTON_ATCK || self.BUTTON_HOOK)
 				{
 					// already fired
 					if(self.hook)
@@ -282,23 +283,23 @@ float W_Hook(float req)
 				}
 			}
 			
-			return TRUE;
+			return true;
 		}
 		case WR_INIT:
 		{
-			precache_model ("models/weapons/g_hookgun.md3");
-			precache_model ("models/weapons/v_hookgun.md3");
-			precache_model ("models/weapons/h_hookgun.iqm");
-			precache_sound ("weapons/hook_impact.wav"); // done by g_hook.qc
-			precache_sound ("weapons/hook_fire.wav");
-			precache_sound ("weapons/hookbomb_fire.wav");
+			precache_model("models/weapons/g_hookgun.md3");
+			precache_model("models/weapons/v_hookgun.md3");
+			precache_model("models/weapons/h_hookgun.iqm");
+			precache_sound("weapons/hook_impact.wav"); // done by g_hook.qc
+			precache_sound("weapons/hook_fire.wav");
+			precache_sound("weapons/hookbomb_fire.wav");
 			HOOK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
-			return TRUE;
+			return true;
 		}
 		case WR_SETUP:
 		{
 			self.hook_state &= ~HOOK_WAITING_FOR_RELEASE;
-			return TRUE;
+			return true;
 		}
 		case WR_CHECKAMMO1:
 		{
@@ -310,28 +311,28 @@ float W_Hook(float req)
 		case WR_CHECKAMMO2:
 		{
 			// infinite ammo for now
-			return TRUE; // self.ammo_cells >= WEP_CVAR_SEC(hook, ammo); // WEAPONTODO: see above
+			return true; // self.ammo_cells >= WEP_CVAR_SEC(hook, ammo); // WEAPONTODO: see above
 		}
 		case WR_CONFIG:
 		{
 			HOOK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
-			return TRUE;
+			return true;
 		}
 		case WR_RESETPLAYER:
 		{
 			self.hook_refire = time;
-			return TRUE;
+			return true;
 		}
 		case WR_SUICIDEMESSAGE:
 		{
-			return FALSE;
+			return false;
 		}
 		case WR_KILLMESSAGE:
 		{
 			return WEAPON_HOOK_MURDER;
 		}
 	}
-	return TRUE;
+	return false;
 }
 #endif
 #ifdef CSQC
@@ -347,20 +348,20 @@ float W_Hook(float req)
 			if(!w_issilent)
 				sound(self, CH_SHOTS, "weapons/hookbomb_impact.wav", VOL_BASE, ATTN_NORM);
 				
-			return TRUE;
+			return true;
 		}
 		case WR_INIT:
 		{
 			precache_sound("weapons/hookbomb_impact.wav");
-			return TRUE;
+			return true;
 		}
 		case WR_ZOOMRETICLE:
 		{
 			// no weapon specific image for this weapon
-			return FALSE;
+			return false;
 		}
 	}
-	return TRUE;
+	return false;
 }
 #endif
 #endif