From: Mario <mario@smbclan.net>
Date: Fri, 22 Jan 2016 02:02:15 +0000 (+1000)
Subject: Remove flight buff
X-Git-Tag: xonotic-v0.8.2~1221
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05e4167289119adb078c79e76020c1c30ea20084;p=xonotic%2Fxonotic-data.pk3dir.git

Remove flight buff
---

diff --git a/mutators.cfg b/mutators.cfg
index 3711d1de6..416a2f507 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -335,9 +335,6 @@ set g_buffs_vampire_damage_steal 0.6 "damage stolen multiplier while holding vam
 set g_buffs_jump 0 "jump buff: greatly increased jump height"
 set g_buffs_jump_time 60 "jump buff carry time"
 set g_buffs_jump_height 600 "jump height while holding jump buff"
-set g_buffs_flight 0 "flight buff: greatly decreased gravity"
-set g_buffs_flight_time 60 "flight buff carry time"
-set g_buffs_flight_gravity 0.3 "player gravity multiplier while holding flight buff"
 set g_buffs_invisible 1 "invisible buff: carrier becomes invisible"
 set g_buffs_invisible_time 60 "invisible buff carry time"
 set g_buffs_invisible_alpha 0.15 "player invisibility multiplier while holding invisible buff"
diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc
index de14e9f36..f6c25f761 100644
--- a/qcsrc/common/mutators/mutator/buffs/all.inc
+++ b/qcsrc/common/mutators/mutator/buffs/all.inc
@@ -76,14 +76,6 @@ REGISTER_BUFF(JUMP) {
 }
 BUFF_SPAWNFUNCS(jump, BUFF_JUMP)
 
-REGISTER_BUFF(FLIGHT) {
-    this.m_prettyName = _("Flight");
-    this.m_name = "flight";
-    this.m_skin = 11;
-    this.m_color = '0.33 0.56 1';
-}
-BUFF_SPAWNFUNCS(flight, BUFF_FLIGHT)
-
 REGISTER_BUFF(INVISIBLE) {
     this.m_prettyName = _("Invisible");
     this.m_name = "invisible";
diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qc b/qcsrc/common/mutators/mutator/buffs/buffs.qc
index cba5abf85..d810cd9f8 100644
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qc
@@ -36,7 +36,6 @@ float autocvar_g_buffs_speed_damage_take;
 float autocvar_g_buffs_speed_regen;
 float autocvar_g_buffs_vampire_damage_steal;
 float autocvar_g_buffs_invisible_alpha;
-float autocvar_g_buffs_flight_gravity;
 float autocvar_g_buffs_jump_height;
 float autocvar_g_buffs_inferno_burntime_factor;
 float autocvar_g_buffs_inferno_burntime_min_time;
@@ -54,8 +53,6 @@ float autocvar_g_buffs_luck_damagemultiplier = 3;
 .int buff_ammo_prev_clipload;
 // invisible
 .float buff_invisible_prev_alpha;
-// flight
-.float buff_flight_prev_gravity;
 // medic
 .float buff_medic_healtime;
 // disability
@@ -816,11 +813,6 @@ MUTATOR_HOOKFUNCTION(buffs, CustomizeWaypoint)
 
 MUTATOR_HOOKFUNCTION(buffs, OnEntityPreSpawn, CBC_ORDER_LAST)
 {SELFPARAM();
-	if (self.classname == "item_flight" && cvar("g_buffs") && cvar("g_buffs_flight"))
-	{
-		buff_Init_Compat(self, BUFF_FLIGHT);
-		return true;
-	}
 	if(autocvar_g_buffs_replace_powerups)
 	switch(self.classname)
 	{
@@ -975,15 +967,6 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 		BUFF_ONREM(BUFF_INVISIBLE)
 			self.alpha = self.buff_invisible_prev_alpha;
 
-		BUFF_ONADD(BUFF_FLIGHT)
-		{
-			self.buff_flight_prev_gravity = self.gravity;
-			self.gravity = autocvar_g_buffs_flight_gravity;
-		}
-
-		BUFF_ONREM(BUFF_FLIGHT)
-			self.gravity = self.buff_flight_prev_gravity;
-
 		self.oldbuffs = self.buffs;
 		if(self.buffs)
 		{
diff --git a/qcsrc/common/mutators/mutator/buffs/module.inc b/qcsrc/common/mutators/mutator/buffs/module.inc
index be0097714..ab8747774 100644
--- a/qcsrc/common/mutators/mutator/buffs/module.inc
+++ b/qcsrc/common/mutators/mutator/buffs/module.inc
@@ -11,15 +11,6 @@ string BUFF_NAME(int i)
     return sprintf("%s%s", rgb_to_hexcolor(b.m_color), b.m_prettyName);
 }
 
-#ifndef MENUQC
-REGISTER_MUTATOR(buffs_flight, true);
-MUTATOR_HOOKFUNCTION(buffs_flight, IsFlying)
-{
-    noref entity e = MUTATOR_ARGV(0, entity);
-	return BUFFS_STAT(e) & BUFF_FLIGHT.m_itemid;
-}
-#endif
-
 #ifdef CSQC
 REGISTER_MUTATOR(cl_buffs, true);
 MUTATOR_HOOKFUNCTION(cl_buffs, HUD_Powerups_add)
diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 88e9c2a66..4ea7a3348 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -141,7 +141,7 @@ spawnfunc(target_give)
 	InitializeEntity(self, target_give_init, INITPRIO_FINDTARGET);
 }
 
-//spawnfunc(item_flight)       /* handled by buffs mutator or jetpack */
+//spawnfunc(item_flight)       /* handled by jetpack */
 //spawnfunc(item_haste)        /* handled by buffs mutator */
 //spawnfunc(item_health)       /* handled in t_quake.qc */
 //spawnfunc(item_health_large) /* handled in t_items.qc */