Fix for fear failing, removed #fear command because it was blank anyway, added a cmake command to change the default map/water/path directory

This commit is contained in:
KimLS
2014-05-31 16:32:15 -07:00
parent 8a5405060f
commit 3690f93302
6 changed files with 14 additions and 190 deletions
+7 -7
View File
@@ -121,17 +121,17 @@ bool Map::LineIntersectsZoneNoZLeaps(Vertex start, Vertex end, float step_mag, V
int steps = 0;
if (step.x > 0 && step.x < 0.001f)
step.x = 0.001f;
step.x = 0.001f;
if (step.y > 0 && step.y < 0.001f)
step.y = 0.001f;
step.y = 0.001f;
if (step.z > 0 && step.z < 0.001f)
step.z = 0.001f;
step.z = 0.001f;
if (step.x < 0 && step.x > -0.001f)
step.x = -0.001f;
step.x = -0.001f;
if (step.y < 0 && step.y > -0.001f)
step.y = -0.001f;
step.y = -0.001f;
if (step.z < 0 && step.z > -0.001f)
step.z = -0.001f;
step.z = -0.001f;
//while we are not past end
//always do this once, even if start == end.
@@ -148,7 +148,7 @@ bool Map::LineIntersectsZoneNoZLeaps(Vertex start, Vertex end, float step_mag, V
float diff = best_z - z;
diff = diff < 0 ? -diff : diff;
if (z == -999999 || best_z == -999999 || diff < 12.0)
if (z <= BEST_Z_INVALID || best_z <= BEST_Z_INVALID || diff < 12.0)
z = best_z;
else
return true;