From 08b1d1a7ec322dba46407d7854ad02ad9cd6ecff Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Tue, 6 Aug 2002 01:31:55 +0000
Subject: [PATCH] load DMB levels

---
 main/gamemine.c |  6 ++++--
 main/gamesave.c | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/main/gamemine.c b/main/gamemine.c
index 528f396b..6784e420 100644
--- a/main/gamemine.c
+++ b/main/gamemine.c
@@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: gamemine.c,v 1.10 2002-08-04 23:37:34 btb Exp $";
+static char rcsid[] = "$Id: gamemine.c,v 1.11 2002-08-06 01:31:55 btb Exp $";
 #endif
 
 #include <stdio.h>
@@ -1028,7 +1028,9 @@ int load_mine_data_compiled(CFILE *LoadFile)
 
 	//=============================== Reading part ==============================
 	compiled_version = cfile_read_byte(LoadFile);
-	Assert( compiled_version==COMPILED_MINE_VERSION );
+	//Assert( compiled_version==COMPILED_MINE_VERSION );
+ 	if (compiled_version!=COMPILED_MINE_VERSION)
+		mprintf((0,"compiled mine version=%i\n", compiled_version)); //many levels have "wrong" versions.  Theres no point in aborting because of it, I think.
 
 	Num_vertices = cfile_read_short(LoadFile);
 	Assert( Num_vertices <= MAX_VERTICES );
diff --git a/main/gamesave.c b/main/gamesave.c
index eeaf01bc..383deebd 100644
--- a/main/gamesave.c
+++ b/main/gamesave.c
@@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-char gamesave_rcsid[] = "$Id: gamesave.c,v 1.11 2002-08-04 23:37:34 btb Exp $";
+char gamesave_rcsid[] = "$Id: gamesave.c,v 1.12 2002-08-06 01:31:55 btb Exp $";
 #endif
 
 #include <stdio.h>
@@ -939,9 +939,11 @@ int load_game_data(CFILE *LoadFile)
 		Current_level_name[0]=0;
 
 	if (game_top_fileinfo.fileinfo_version >= 19) {	//load pof names
-//		cfread(&N_save_pof_names,2,1,LoadFile);
 		N_save_pof_names = cfile_read_short(LoadFile);
-		cfread(Save_pof_names,N_save_pof_names,FILENAME_LEN,LoadFile);
+		if (N_save_pof_names != 0x614d && N_save_pof_names != 0x5547) { // "Ma"de w/DMB beta/"GU"ILE
+			Assert(N_save_pof_names < MAX_POLYGON_MODELS);
+			cfread(Save_pof_names,N_save_pof_names,FILENAME_LEN,LoadFile);
+		}
 	}
 
 	//===================== READ PLAYER INFO ==========================
@@ -1132,10 +1134,10 @@ int load_game_data(CFILE *LoadFile)
 	//================ READ CONTROL CENTER TRIGGER INFO ===============
 
 	if (game_fileinfo.control_offset > -1)
-		if (!cfseek( LoadFile, game_fileinfo.control_offset,SEEK_SET ))
-			for (i=0;i<game_fileinfo.control_howmany;i++)
-				control_center_triggers_read(&ControlCenterTriggers, LoadFile);
-
+		if (!cfseek( LoadFile, game_fileinfo.control_offset,SEEK_SET )) {
+			Assert(game_fileinfo.control_howmany == 1);
+			control_center_triggers_read(&ControlCenterTriggers, LoadFile);
+		}
 
 	//================ READ MATERIALOGRIFIZATIONATORS INFO ===============
 
@@ -1457,6 +1459,7 @@ int load_level(char * filename_passed)
 
 	sig                      = cfile_read_int(LoadFile);
 	Gamesave_current_version = cfile_read_int(LoadFile);
+	mprintf((0, "Gamesave_current_version = %d\n", Gamesave_current_version));
 	minedata_offset          = cfile_read_int(LoadFile);
 	gamedata_offset          = cfile_read_int(LoadFile);
 
-- 
2.39.2