From 944baf824d4996c3819eefa00fd4acbbeec5f312 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Tue, 21 Oct 2014 03:14:36 +0000
Subject: [PATCH] Remove #define segment2 segment

---
 common/main/segment.h     | 6 ++----
 similar/main/gamemine.cpp | 4 ++--
 similar/main/gameseg.cpp  | 7 +++----
 similar/main/segment.cpp  | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/common/main/segment.h b/common/main/segment.h
index 6e31e8649..10b1260da 100644
--- a/common/main/segment.h
+++ b/common/main/segment.h
@@ -228,8 +228,6 @@ struct segment {
 };
 
 #if defined(DXX_BUILD_DESCENT_II)
-#define segment2 segment
-
 #define Segment2s Segments
 
 #define S2F_AMBIENT_WATER   0x01
@@ -396,7 +394,7 @@ extern void add_segment_to_group(int segment_num, int group_num);
 /*
  * reads a segment2 structure from a PHYSFS_file
  */
-void segment2_read(segment2 *s2, PHYSFS_file *fp);
+void segment2_read(segment *s2, PHYSFS_file *fp);
 
 /*
  * reads a delta_light structure from a PHYSFS_file
@@ -408,7 +406,7 @@ void delta_light_read(delta_light *dl, PHYSFS_file *fp);
  */
 void dl_index_read(dl_index *di, PHYSFS_file *fp);
 
-void segment2_write(segment2 *s2, PHYSFS_file *fp);
+void segment2_write(const segment *s2, PHYSFS_file *fp);
 void delta_light_write(delta_light *dl, PHYSFS_file *fp);
 void dl_index_write(dl_index *di, PHYSFS_file *fp);
 #endif
diff --git a/similar/main/gamemine.cpp b/similar/main/gamemine.cpp
index da1d80f05..9e45d7f91 100644
--- a/similar/main/gamemine.cpp
+++ b/similar/main/gamemine.cpp
@@ -456,7 +456,7 @@ int load_mine_data(PHYSFS_file *LoadFile)
 
 	mine_fileinfo.segment2_offset		= -1;
 	mine_fileinfo.segment2_howmany	= 0;
-	mine_fileinfo.segment2_sizeof    = sizeof(segment2);
+	mine_fileinfo.segment2_sizeof    = 0;
 #endif
 
 	// Read in mine_top_fileinfo to get size of saved fileinfo.
@@ -704,7 +704,7 @@ int load_mine_data(PHYSFS_file *LoadFile)
 		if (mine_top_fileinfo.fileinfo_version >= 20)
 			range_for (auto i, highest_valid(Segments))
 			{
-				PHYSFS_read(LoadFile, &Segment2s[i], sizeof(segment2), 1);
+				segment2_read(&Segments[i], LoadFile);
 				fuelcen_activate( &Segments[i], Segment2s[i].special );
 			}
 #endif
diff --git a/similar/main/gameseg.cpp b/similar/main/gameseg.cpp
index b6b6a7ba1..e19746db8 100644
--- a/similar/main/gameseg.cpp
+++ b/similar/main/gameseg.cpp
@@ -1665,7 +1665,6 @@ static void apply_light_to_segment(visited_segment_bitarray_t &visited, segment
 				light_at_point = Magical_light_constant;
 	
 			if (light_at_point >= 0) {
-				segment2	*seg2p	= &Segment2s[segnum];
 				light_at_point = fixmul(light_at_point, light_intensity);
 #if 0   // don't see the point, static_light can be greater than F1_0
 				if (light_at_point >= F1_0)
@@ -1673,9 +1672,9 @@ static void apply_light_to_segment(visited_segment_bitarray_t &visited, segment
 				if (light_at_point <= -F1_0)
 					light_at_point = -(F1_0-1);
 #endif
-				seg2p->static_light += light_at_point;
-				if (seg2p->static_light < 0)	// if it went negative, saturate
-					seg2p->static_light = 0;
+				segp->static_light += light_at_point;
+				if (segp->static_light < 0)	// if it went negative, saturate
+					segp->static_light = 0;
 			}	//	end if (light_at_point...
 		}	//	end if (dist_to_rseg...
 	}
diff --git a/similar/main/segment.cpp b/similar/main/segment.cpp
index 0c2dd511e..829747aaf 100644
--- a/similar/main/segment.cpp
+++ b/similar/main/segment.cpp
@@ -30,7 +30,7 @@ void segment_side_wall_tmap_write(PHYSFS_file *fp, const side &side)
 /*
  * reads a segment2 structure from a PHYSFS_file
  */
-void segment2_read(segment2 *s2, PHYSFS_file *fp)
+void segment2_read(segment *s2, PHYSFS_file *fp)
 {
 	s2->special = PHYSFSX_readByte(fp);
 	s2->matcen_num = PHYSFSX_readByte(fp);
@@ -65,7 +65,7 @@ void dl_index_read(dl_index *di, PHYSFS_file *fp)
 	di->index = PHYSFSX_readShort(fp);
 }
 
-void segment2_write(segment2 *s2, PHYSFS_file *fp)
+void segment2_write(const segment *s2, PHYSFS_file *fp)
 {
 	PHYSFSX_writeU8(fp, s2->special);
 	PHYSFSX_writeU8(fp, s2->matcen_num);