[Warzone2100-commits] mainline - pre-3.0: 2 commits.

[Christian O. <ch...@gm...>]

Commit:     5bb1b88f2299c75a257bfaeb0fc79cfdff4f17bb

Trac URL:   http://developer.wz2100.net/changeset/5bb1b88f2299c75a257bfaeb0fc79cfdff4f17bb

Author:     Christian Ohm <ch...@gm...>
Date:       Mon Oct 18 15:34:01 2010 +0200

Lower skybox scale to fix skybox drawing.

Refs #575.

 src/display3d.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/display3d.c b/src/display3d.c
index 3d6a37d..086d5a4 100644
--- a/src/display3d.c
+++ b/src/display3d.c
@@ -3590,7 +3590,7 @@ static void locateMouse(void)
 static void renderSurroundings(void)
 {
 	static float wind = 0.0f;
-	const float skybox_scale = 20000.0f;
+	const float skybox_scale = 10000.0f;
 // check with TRUNK
 	const float height = 20.0f * TILE_UNITS;
 	const float wider  = 2.0f * (visibleTiles.x * TILE_UNITS);


-------------------------

Commit:     a32651d3b218afaf31a3830b8f2cee96bf76560b

Trac URL:   http://developer.wz2100.net/changeset/a32651d3b218afaf31a3830b8f2cee96bf76560b

Author:     Christian Ohm <ch...@gm...>
Date:       Mon Oct 18 17:52:43 2010 +0200

Don't crash when the lassat fires.

Return 1000 in checkFireLine (the same as when source and target position are
the same, in line 1009) when psViewer is NULL. Closes #2229.

 src/visibility.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


-------------------------