From: terencehill <piuntn@gmail.com>
Date: Fri, 15 Feb 2013 19:44:17 +0000 (+0100)
Subject: Also block grappling hook when not playing a round
X-Git-Tag: xonotic-v0.7.0~61^2~42
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c81392be67655f85f896af8ea5d11f5d2d3c74a9;p=xonotic%2Fxonotic-data.pk3dir.git

Also block grappling hook when not playing a round
---

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index 83366b642..dec6e167d 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -121,7 +121,7 @@ void GrapplingHookThink()
 		error("Owner lost the hook!\n");
 		return;
 	}
-	if(LostMovetypeFollow(self) || intermission_running)
+	if(LostMovetypeFollow(self) || intermission_running || (round_handler_IsActive() && !round_handler_IsRoundStarted()))
 	{
 		RemoveGrapplingHook(self.realowner);
 		return;
@@ -299,9 +299,7 @@ void FireGrapplingHook (void)
 	float s;
 	vector vs;
 
-	if(time < game_starttime) return;
-	if(self.player_blocked) return;
-	if(self.freezetag_frozen) return;
+	if(forbidWeaponUse()) return;
 	if(self.vehicle) return;
 
 	makevectors(self.v_angle);