Disallow grapple hook when attacking or dueling

Razish · Dec 25, 2013 · 342a3b8 · 342a3b8
1 parent 74d164d
commit 342a3b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/game/g_active.c b/game/g_active.c
@@ -3437,6 +3437,8 @@ void ClientThink_real( gentity_t *ent ) {
 	if ( ent->s.eType != ET_NPC &&
 		 ent->client &&
 		 ent->client->pers.connected == CON_CONNECTED &&
+		 !ent->client->ps.duelInProgress &&
+		 !BG_SaberInAttack( ent->client->ps.saberMove ) &&
 		 !!(japp_allowHook.integer & (1<<level.gametype)))
 	{
 		if ( !ent->client->hook && (pm.cmd.buttons & BUTTON_GRAPPLE) && ent->client->ps.pm_type != PM_DEAD /*&& !ent->client->hookHasBeenFired*/ )

diff --git a/game/g_missile.c b/game/g_missile.c
@@ -949,6 +949,16 @@ void G_RunMissile( gentity_t *ent ) {
 		}
 	}
 
+	if ( ent->parent &&
+		 ent->parent->client &&
+		 ent->parent->client->hook == ent &&
+ 		 (ent->parent->client->ps.duelInProgress ||
+		 BG_SaberInAttack( ent->parent->client->ps.saberMove ) ||
+		 !(japp_allowHook.integer & (1<<level.gametype))) )
+	{// not allowed to have hook out
+		Weapon_HookFree( ent->parent->client->hook );
+	}
+
 	if ( tr.fraction != 1) {
 		// never explode or bounce on sky
 		if ( tr.surfaceFlags & SURF_NOIMPACT )
@@ -958,11 +968,7 @@ void G_RunMissile( gentity_t *ent ) {
 		//	if ( ent->parent && ent->parent->client && ent->parent->client->hook == ent )
 		//		ent->parent->client->hook = NULL;
 			if ( ent->parent && ent->parent->client && ent->parent->client->hook == ent )
-			{
-				ent->parent->client->hook				= NULL;
-				ent->parent->client->hookHasBeenFired	= qfalse;
-				ent->parent->client->fireHeld			= qfalse;
-			}
+				Weapon_HookFree( ent->parent->client->hook );
 			//[/Grapple]
 
 			if ((ent->s.weapon == WP_SABER && ent->isSaberEntity) || isKnockedSaber)