r4667 - in branches/nexuiz-2.0: . data/qcsrc/client data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Oct 8 10:10:14 EDT 2008
Author: div0
Date: 2008-10-08 10:10:09 -0400 (Wed, 08 Oct 2008)
New Revision: 4667
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/qcsrc/client/View.qc
branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc
Log:
r4665 | div0 | 2008-10-08 15:15:43 +0200 (Wed, 08 Oct 2008) | 2 lines
use q3map2 not mapinfo bounds for short circuit
r4666 | div0 | 2008-10-08 15:21:02 +0200 (Wed, 08 Oct 2008) | 2 lines
fix division by zero if cl_zoomfactor == 1
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2008-10-08 13:21:02 UTC (rev 4666)
+++ branches/nexuiz-2.0/.patchsets 2008-10-08 14:10:09 UTC (rev 4667)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-4663
+revisions_applied = 1-4666
Modified: branches/nexuiz-2.0/data/qcsrc/client/View.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/View.qc 2008-10-08 13:21:02 UTC (rev 4666)
+++ branches/nexuiz-2.0/data/qcsrc/client/View.qc 2008-10-08 14:10:09 UTC (rev 4667)
@@ -161,7 +161,12 @@
}
}
- current_zoomfraction = (current_viewzoom - 1) / (1/zoomfactor - 1);
+ if(almost_equals(current_viewzoom, 1))
+ current_zoomfraction = 0;
+ else if(almost_equals(current_viewzoom, 1/zoomfactor))
+ current_zoomfraction = 1;
+ else
+ current_zoomfraction = (current_viewzoom - 1) / (1/zoomfactor - 1);
if(zoomsensitivity < 1)
setsensitivityscale(pow(current_viewzoom, 1 - zoomsensitivity));
Modified: branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc 2008-10-08 13:21:02 UTC (rev 4666)
+++ branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc 2008-10-08 14:10:09 UTC (rev 4667)
@@ -47,13 +47,13 @@
ma = '1 0 0' * w + '0 1 0' * h + dz;
o = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin;
- if(x < world.mins_x - w)
+ if(x < world.absmin_x - w)
return 0;
- if(y < world.mins_y - h)
+ if(y < world.absmin_y - h)
return 0;
- if(x > world.maxs_x)
+ if(x > world.absmax_x)
return 0;
- if(y > world.maxs_y)
+ if(y > world.absmax_y)
return 0;
r = 0;
More information about the nexuiz-commits
mailing list