From 836cae5456b8f2bf700a20f3255633cfc0f81d95 Mon Sep 17 00:00:00 2001
From: zicodxx <zicodxx@yahoo.de>
Date: Sat, 7 May 2011 12:25:03 +0200
Subject: [PATCH] Taken out Render_depth reduction of Endlevel sequence in
 Software rendering build; Fixed two compiler warnings regarding set but
 unused variables

---
 CHANGELOG.txt   |  1 +
 main/endlevel.c | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0dba8c727..14db6b6e6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ D1X-Rebirth Changelog
 --------
 arch/carbon/conf.h: Enabled Tracker support for Mac OS
 RELEASE-NOTES.txt, README.txt, SConstruct, arch/carbon/conf.h: Changed version from 0.56 to 0.57; Added first draft for RELEASE-NOTES.txt; updated docs
+main/endlevel.c: Taken out Render_depth reduction of Endlevel sequence in Software rendering build; Fixed two compiler warnings regarding set but unused variables
 
 20110505
 --------
diff --git a/main/endlevel.c b/main/endlevel.c
index a5ac78529..7657d7ba0 100644
--- a/main/endlevel.c
+++ b/main/endlevel.c
@@ -202,7 +202,10 @@ int endlevel_data_loaded=0;
 
 void start_endlevel_sequence()
 {
-	int last_segnum,exit_side,tunnel_length;
+#ifndef NDEBUG
+	int last_segnum;
+#endif
+	int exit_side,tunnel_length;
 
 	reset_rear_view(); //turn off rear view if set - NOTE: make sure this happens before we pause demo recording!!
 
@@ -253,9 +256,9 @@ void start_endlevel_sequence()
 			PlayerFinishedLevel(0);		//don't do special sequence
 			return;
 		}
-
+#ifndef NDEBUG
 		last_segnum = old_segnum;
-
+#endif
 		//now pick transition segnum 1/3 of the way in
 
 		old_segnum = ConsoleObject->segnum;
@@ -271,9 +274,9 @@ void start_endlevel_sequence()
 		transition_segnum = segnum;
 
 	}
-
+#ifndef NDEBUG
 	Assert(last_segnum == exit_segnum);
-
+#endif
 	#ifdef NETWORK
 	if (Game_mode & GM_MULTI) {
 		multi_send_endlevel_start(0);
@@ -485,7 +488,6 @@ void do_endlevel_frame()
 		if ((explosion_wait1-=FrameTime) < 0) {
 			vms_vector tpnt;
 			int segnum;
-			object *expl;
 			static int sound_count;
 
 			vm_vec_scale_add(&tpnt,&ConsoleObject->pos,&ConsoleObject->orient.fvec,-ConsoleObject->size*5);
@@ -495,7 +497,7 @@ void do_endlevel_frame()
 			segnum = find_point_seg(&tpnt,ConsoleObject->segnum);
 
 			if (segnum != -1) {
-				expl = object_create_explosion(segnum,&tpnt,i2f(20),VCLIP_BIG_PLAYER_EXPLOSION);
+				object_create_explosion(segnum,&tpnt,i2f(20),VCLIP_BIG_PLAYER_EXPLOSION);
 				if (d_rand()<10000 || ++sound_count==7) {		//pseudo-random
 					digi_link_sound_to_pos( SOUND_TUNNEL_EXPLOSION, segnum, 0, &tpnt, 0, F1_0 );
 					sound_count=0;
@@ -840,7 +842,9 @@ fix satellite_size = i2f(400);
 
 void render_external_scene(fix eye_offset)
 {
+#ifdef OGL
 	int orig_Render_depth = Render_depth;
+#endif
 	Viewer_eye = Viewer->pos;
 	g3s_lrgb lrgb = { f1_0, f1_0, f1_0 };
 
@@ -885,11 +889,11 @@ void render_external_scene(fix eye_offset)
 
 #ifdef OGL
 	ogl_toggle_depth_test(0);
-#endif
 	Render_depth = (200-(vm_vec_dist_quick(&mine_ground_exit_point, &Viewer_eye)/F1_0))/36;
+#endif
 	render_terrain(&mine_ground_exit_point,exit_point_bmx,exit_point_bmy);
-	Render_depth = orig_Render_depth;
 #ifdef OGL
+	Render_depth = orig_Render_depth;
 	ogl_toggle_depth_test(1);
 #endif