From: Samual <samual@xonotic.org>
Date: Mon, 2 Apr 2012 16:18:21 +0000 (-0400)
Subject: Make flags float in water
X-Git-Tag: xonotic-v0.7.0~240^2~90
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=82e1cffc34ab9c2ec20bd585f507ecffa14085e2;p=xonotic%2Fxonotic-data.pk3dir.git

Make flags float in water
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b902bed78..f430022f0 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -611,6 +611,7 @@ set g_ctf_reverse 0	"if enabled, flags positions are switched: you have to captu
 set g_ctf_flag_collect_delay 1
 set g_ctf_flag_health 0
 set g_ctf_flag_dropped_waypoint 2 "show dropped flag waypointsprite when a flag is lost. 1 = team only, 2 = for all players"
+set g_ctf_flag_dropped_floatinwater 200 "move upwards while in water at this velocity"
 set g_ctf_flag_pickup_verbosename 0 "show the name of the person who picked up the flag too"
 set g_ctf_drop 1 "dropping allows circumventing carrierkill score, so enable this with care!"
 set g_ctf_drop_velocity 500 "how fast or far a player can throw the flag"
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index ed7401aa8..db783ae63 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -779,6 +779,7 @@ float autocvar_g_ctf_flag_capture_effects;
 float autocvar_g_ctf_flag_collect_delay;
 float autocvar_g_ctf_flag_damageforcescale;
 float autocvar_g_ctf_flag_dropped_waypoint;
+float autocvar_g_ctf_flag_dropped_floatinwater;
 float autocvar_g_ctf_flag_glowtrails;
 float autocvar_g_ctf_flag_health;
 float autocvar_g_ctf_flag_pickup_effects;
diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 7a905a0b7..e63a84fe5 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -576,6 +576,9 @@ void ctf_FlagThink()
 		
 		case FLAG_DROPPED:
 		{
+			if(autocvar_g_ctf_flag_dropped_floatinwater && (self.flags & FL_INWATER))
+					self.velocity_z = autocvar_g_ctf_flag_dropped_floatinwater;
+		
 			if(autocvar_g_ctf_flag_return_dropped)
 			{
 				if((vlen(self.origin - self.ctf_spawnorigin) <= autocvar_g_ctf_flag_return_dropped) || (autocvar_g_ctf_flag_return_dropped == -1))