From 372d0f273300987242927f0421fbaf21ebf91b3f Mon Sep 17 00:00:00 2001
From: Chris Taylor <kreatordxx@dxx-rebirth.bzr.sourceforge.net>
Date: Sat, 14 Apr 2012 13:46:20 +0800
Subject: [PATCH] Set Gamesave_current_version to correct version when making a
 new mine, move create_new_mine to gamesave.c

---
 editor/segment.c        | 65 ----------------------------------------
 include/editor/editor.h |  8 +++++
 main/gamesave.c         | 66 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/editor/segment.c b/editor/segment.c
index 0244dc453..15c568c1e 100644
--- a/editor/segment.c
+++ b/editor/segment.c
@@ -1663,71 +1663,6 @@ void init_all_vertices(void)
 
 }
 
-// --------------------------------------------------------------------------------------
-//	Create a new mine, set global variables.
-int create_new_mine(void)
-{
-	int	s;
-	vms_vector	sizevec;
-	vms_matrix	m1 = IDENTITY_MATRIX;
-
-	// initialize_mine_arrays();
-
-//	gamestate_not_restored = 1;
-
-	// Clear refueling center code
-	fuelcen_reset();
-//	hostage_init_all();
-
-	init_all_vertices();
-
-	Current_level_num = 0;		//0 means not a real level
-	Current_level_name[0] = 0;
-
-	Cur_object_index = -1;
-	reset_objects(1);		//just one object, the player
-
-	num_groups = 0;
-	current_group = -1;
-
-
-	Num_vertices = 0;		// Number of vertices in global array.
-	Highest_vertex_index = 0;
-	Num_segments = 0;		// Number of segments in global array, will get increased in med_create_segment
-	Highest_segment_index = 0;
-	Cursegp = Segments;	// Say current segment is the only segment.
-	Curside = WBACK;		// The active side is the back side
-	Markedsegp = 0;		// Say there is no marked segment.
-	Markedside = WBACK;	//	Shouldn't matter since Markedsegp == 0, but just in case...
-	for (s=0;s<MAX_GROUPS+1;s++) {
-		GroupList[s].num_segments = 0;		
-		GroupList[s].num_vertices = 0;		
-		Groupsegp[s] = NULL;
-		Groupside[s] = 0;
-	}
-
-	Num_robot_centers = 0;
-	Num_open_doors = 0;
-	wall_init();
-	trigger_init();
-
-	// Create New_segment, which is the segment we will be adding at each instance.
-	med_create_new_segment(vm_vec_make(&sizevec,DEFAULT_X_SIZE,DEFAULT_Y_SIZE,DEFAULT_Z_SIZE));		// New_segment = Segments[0];
-//	med_create_segment(Segments,0,0,0,DEFAULT_X_SIZE,DEFAULT_Y_SIZE,DEFAULT_Z_SIZE,vm_mat_make(&m1,F1_0,0,0,0,F1_0,0,0,0,F1_0));
-	med_create_segment(Segments,0,0,0,DEFAULT_X_SIZE,DEFAULT_Y_SIZE,DEFAULT_Z_SIZE,&m1);
-
-	N_found_segs = 0;
-	N_selected_segs = 0;
-	N_warning_segs = 0;
-
-	//--repair-- create_local_segment_data();
-
-	ControlCenterTriggers.num_links = 0;
-
-    //editor_status("New mine created.");
-	return	0;			// say no error
-}
-
 // --------------------------------------------------------------------------------------------------
 // Copy a segment from *ssp to *dsp.  Do not simply copy the struct.  Use *dsp's vertices, copying in
 //	just the values, not the indices.
diff --git a/include/editor/editor.h b/include/editor/editor.h
index f990f0333..0105e30b8 100644
--- a/include/editor/editor.h
+++ b/include/editor/editor.h
@@ -210,6 +210,9 @@ extern	int		SegSizeMode;			// Mode = 0/1 = not/is legal to move bound vertices,
 void init_editor(void);
 void close_editor(void);
 
+//	Initialize all vertices to inactive status.
+extern void init_all_vertices(void);
+
 //	Returns true if vertex vi is contained in exactly one segment, else returns false.
 extern int is_free_vertex(int vi);
 
@@ -318,6 +321,11 @@ extern	void old_med_attach_segment(segment *sp,int main_side,int branch_side,fix
 //	just the values, not the indices.
 extern	void med_copy_segment(segment *dsp,segment *ssp);
 
+//	Create a segment given center, dimensions, rotation matrix.
+//	Note that the created segment will always have planar sides and rectangular cross sections.
+//	It will be created with walls on all sides, ie not connected to anything.
+void med_create_segment(segment *sp,fix cx, fix cy, fix cz, fix length, fix width, fix height, vms_matrix *mp);
+
 //	Create a default segment.
 //	Useful for when user creates a garbage segment.
 extern	void med_create_default_segment(segment *sp);
diff --git a/main/gamesave.c b/main/gamesave.c
index 2f164d9ef..fdd951c04 100644
--- a/main/gamesave.c
+++ b/main/gamesave.c
@@ -1433,6 +1433,72 @@ int get_level_name()
 
 #ifdef EDITOR
 
+// --------------------------------------------------------------------------------------
+//	Create a new mine, set global variables.
+int create_new_mine(void)
+{
+	int	s;
+	vms_vector	sizevec;
+	vms_matrix	m1 = IDENTITY_MATRIX;
+	
+	// initialize_mine_arrays();
+	
+	//	gamestate_not_restored = 1;
+	
+	// Clear refueling center code
+	fuelcen_reset();
+	//	hostage_init_all();
+	
+	init_all_vertices();
+	
+	Current_level_num = 0;		//0 means not a real level
+	Current_level_name[0] = 0;
+	Gamesave_current_version = GAME_VERSION;
+	
+	Cur_object_index = -1;
+	reset_objects(1);		//just one object, the player
+	
+	num_groups = 0;
+	current_group = -1;
+	
+	
+	Num_vertices = 0;		// Number of vertices in global array.
+	Highest_vertex_index = 0;
+	Num_segments = 0;		// Number of segments in global array, will get increased in med_create_segment
+	Highest_segment_index = 0;
+	Cursegp = Segments;	// Say current segment is the only segment.
+	Curside = WBACK;		// The active side is the back side
+	Markedsegp = 0;		// Say there is no marked segment.
+	Markedside = WBACK;	//	Shouldn't matter since Markedsegp == 0, but just in case...
+	for (s=0;s<MAX_GROUPS+1;s++) {
+		GroupList[s].num_segments = 0;		
+		GroupList[s].num_vertices = 0;		
+		Groupsegp[s] = NULL;
+		Groupside[s] = 0;
+	}
+	
+	Num_robot_centers = 0;
+	Num_open_doors = 0;
+	wall_init();
+	trigger_init();
+	
+	// Create New_segment, which is the segment we will be adding at each instance.
+	med_create_new_segment(vm_vec_make(&sizevec,DEFAULT_X_SIZE,DEFAULT_Y_SIZE,DEFAULT_Z_SIZE));		// New_segment = Segments[0];
+	//	med_create_segment(Segments,0,0,0,DEFAULT_X_SIZE,DEFAULT_Y_SIZE,DEFAULT_Z_SIZE,vm_mat_make(&m1,F1_0,0,0,0,F1_0,0,0,0,F1_0));
+	med_create_segment(Segments,0,0,0,DEFAULT_X_SIZE,DEFAULT_Y_SIZE,DEFAULT_Z_SIZE,&m1);
+	
+	N_found_segs = 0;
+	N_selected_segs = 0;
+	N_warning_segs = 0;
+	
+	//--repair-- create_local_segment_data();
+	
+	ControlCenterTriggers.num_links = 0;
+	
+    //editor_status("New mine created.");
+	return	0;			// say no error
+}
+
 int	Errors_in_mine;
 
 // -----------------------------------------------------------------------------