r5520 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Jan 14 07:32:26 EST 2009
Author: div0
Date: 2009-01-14 07:32:26 -0500 (Wed, 14 Jan 2009)
New Revision: 5520
Modified:
trunk/data/qcsrc/server/g_subs.qc
trunk/data/qcsrc/server/gamecommand.qc
Log:
fix a case where trace_endpos made no sense
Modified: trunk/data/qcsrc/server/g_subs.qc
===================================================================
--- trunk/data/qcsrc/server/g_subs.qc 2009-01-14 12:20:33 UTC (rev 5519)
+++ trunk/data/qcsrc/server/g_subs.qc 2009-01-14 12:32:26 UTC (rev 5520)
@@ -312,6 +312,7 @@
{
// went too far
trace_fraction = 1;
+ trace_endpos = v2;
return c;
}
Modified: trunk/data/qcsrc/server/gamecommand.qc
===================================================================
--- trunk/data/qcsrc/server/gamecommand.qc 2009-01-14 12:20:33 UTC (rev 5519)
+++ trunk/data/qcsrc/server/gamecommand.qc 2009-01-14 12:32:26 UTC (rev 5520)
@@ -10,15 +10,15 @@
c = a;
- // float n, m;
- // n = m = 0;
+ float n, m;
+ n = m = 0;
while(vlen(c - b) > 1)
{
- //++m;
+ ++m;
tracebox(c, mi, ma, b, MOVE_WORLDONLY, world);
- //++n;
+ ++n;
if(!trace_startsolid)
{
@@ -26,13 +26,14 @@
c = trace_endpos;
}
- /* n += */ tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, world);
+ n += tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, world);
white += vlen(trace_endpos - c);
c = trace_endpos;
}
- //dprint("FullTraceFraction: ", ftos(n), " total traces, ", ftos(m), " iterations\n");
+ if(n > 200)
+ print("HOLY SHIT! FullTraceFraction: ", ftos(n), " total traces, ", ftos(m), " iterations\n");
return white / (black + white);
}
More information about the nexuiz-commits
mailing list