r2607 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat May 19 12:56:31 EDT 2007


Author: div0
Date: 2007-05-19 12:56:31 -0400 (Sat, 19 May 2007)
New Revision: 2607

Modified:
   trunk/data/qcsrc/server/keyhunt.qc
Log:
damn fteqcc; this time:
-       midpoint *= 1 / kh_teams;
+       midpoint = midpoint * (1 / kh_teams);
otherwise it only changes midpoint_x


Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2007-05-19 15:32:57 UTC (rev 2606)
+++ trunk/data/qcsrc/server/keyhunt.qc	2007-05-19 16:56:31 UTC (rev 2607)
@@ -539,6 +539,7 @@
 		vector thisorigin;
 
 		thisorigin = kh_AttachedOrigin(key);
+		dprint("Key origin: ", vtos(thisorigin), "\n");
 		midpoint += thisorigin;
 
 		if(!first)
@@ -552,7 +553,8 @@
 	{
 		te_lightning2(world, lastorigin, firstorigin);
 	}
-	midpoint *= 1 / kh_teams;
+	midpoint = midpoint * (1 / kh_teams);
+	//dprint("Custom flash around ", vtos(midpoint), " color ", vtos(kh_average_teamcolor), "\n");
 	te_customflash(midpoint, 1000, 1, kh_average_teamcolor);
 
 	sound(world, CHAN_AUTO, kh_sound_capture, 1, ATTN_NONE);
@@ -716,8 +718,9 @@
 		//kh_Key_Spawn(my_player, 360 * i / kh_teams);
 		//kh_Key_Spawn(my_player, 360 * i / kh_teams);
 	}
-	kh_average_teamcolor *= 1 / kh_teams;
 
+	kh_average_teamcolor = kh_average_teamcolor * (1 / max3(kh_average_teamcolor_x, kh_average_teamcolor_y, kh_average_teamcolor_z));
+
 	kh_tracking_enabled = FALSE;
 	kh_Controller_SetThink(cvar("g_balance_keyhunt_delay_tracking"), "Scanning frequency range...", kh_EnableTrackingDevice);
 }




More information about the nexuiz-commits mailing list