[Warzone2100-commits] mainline - 3.0: 5 commits.

[buginator <bug...@gn...>]

Commit:     0ca897a7ae9b1ba58d28592f1f693d85ee34535e

Trac URL:   http://developer.wz2100.net/changeset/0ca897a7ae9b1ba58d28592f1f693d85ee34535e

Author:     buginator <bug...@gn...>
Date:       Wed Oct 27 19:06:25 2010 -0400

Sync renderSurroundings() with master

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


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

Commit:     f3406075e3cca5599bf699d0e07fc4e83266e55f

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

Author:     buginator <bug...@gn...>
Date:       Wed Oct 27 19:27:19 2010 -0400

Don't shutdown the map on (specific) SP missions, it still is in use for away missions when we come back.
If said map is shutdown, then instead of crashing, this just makes it so you don't see textures.
Note for the future: Perhaps it is better to just abort out instead, since it means that we
shutdown the map when we were not supposed to...

fixes ticket:2265
fixes ticket:2256

 src/mission.c |    8 ++++++--
 src/terrain.c |    2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)


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

Commit:     c32f6f571d76d7763358af364072eee69b154011

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

Author:     buginator <bug...@gn...>
Date:       Wed Oct 27 19:32:35 2010 -0400

Attempt to fix the visibility voodoo that doesn't account for mission swapping
voodoo that is bad juju.

refs ticket:2265
refs ticket:2256

 src/mission.c    |    8 +++++---
 src/visibility.c |    7 ++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)


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

Commit:     10d69a079115d9cdb2e2ab61968dd0e83ab82147

Trac URL:   http://developer.wz2100.net/changeset/10d69a079115d9cdb2e2ab61968dd0e83ab82147

Author:     buginator <bug...@gn...>
Date:       Wed Oct 27 19:35:55 2010 -0400

Don't allow structures to be built on water, we don't have a naval shipyard yet.

 src/structure.c |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)


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

Commit:     b6952c184456b999fb4dfd51ced072ca1b206740

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

Author:     buginator <bug...@gn...>
Date:       Wed Oct 27 20:13:58 2010 -0400

Don't try to render a string that is NULL.
Unknown why this happens, need someone that has access to non-English systems
to debug this matter more.

refs ticket:2209
refs tickts:2245

 lib/ivis_opengl/textdraw.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/ivis_opengl/textdraw.c b/lib/ivis_opengl/textdraw.c
index e09d155..b27793b 100644
--- a/lib/ivis_opengl/textdraw.c
+++ b/lib/ivis_opengl/textdraw.c
@@ -623,6 +623,8 @@ void iV_DrawTextRotated(const char* string, float XPos, float YPos, float rotati
 {
 	GLint matrix_mode = 0;
 
+	ASSERT_OR_RETURN( , string, "Couldn't render string!");
+
 	pie_SetTexturePage(TEXPAGE_EXTERN);
 
 	glGetIntegerv(GL_MATRIX_MODE, &matrix_mode);


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