From a628cbdd13d4583efa175137c7b8709a7af155dc Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 25 Apr 2013 21:10:22 +0000
Subject: [PATCH] Lunatic (map-int VX) build: implement loading <V7 maps.

git-svn-id: https://svn.eduke32.com/eduke32@3710 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/include/build.h     | 4 +---
 polymer/eduke32/build/src/build.c         | 3 +--
 polymer/eduke32/build/src/engine.c        | 7 ++-----
 polymer/eduke32/build/src/engine_oldmap.h | 6 ++++++
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h
index 142d3019c..d8a554fbc 100644
--- a/polymer/eduke32/build/include/build.h
+++ b/polymer/eduke32/build/include/build.h
@@ -1263,10 +1263,8 @@ int32_t loaddefinitionsfile(const char *fn);
 
 // if loadboard() fails with -2 return, try loadoldboard(). if it fails with
 // -2, board is dodgy
-extern int32_t mapversion;
-#if !defined NEW_MAP_FORMAT
 int32_t loadoldboard(char *filename, char fromwhere, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum);
-#endif
+
 
 // Hash functions
 
diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index 91e8bc4e0..b9e212bfe 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -8041,10 +8041,9 @@ int32_t LoadBoard(const char *filename, uint32_t flags)
 
     ExtPreLoadMap();
     i = loadboard(boardfilename, (flags&4)|loadingflags, &pos, &ang, &cursectnum);
-#if !defined NEW_MAP_FORMAT
     if (i == -2)
         i = loadoldboard(boardfilename,loadingflags, &pos, &ang, &cursectnum);
-#endif
+
     if (i < 0)
     {
 //        printmessage16("Invalid map format.");
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 93a6f882d..35a206aed 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -9930,10 +9930,7 @@ int32_t loadboard(char *filename, char flags, vec3_t *dapos, int16_t *daang, int
 //
 // loadboardv5/6
 //
-#if !defined NEW_MAP_FORMAT
-// V5/V6 map format loading: NYI for NEW_MAP_FORMAT
-
-# include "engine_oldmap.h"
+#include "engine_oldmap.h"
 
 // Powerslave uses v6
 // Witchaven 1 and TekWar and LameDuke use v5
@@ -10110,7 +10107,7 @@ int32_t loadoldboard(char *filename, char fromwhere, vec3_t *dapos, int16_t *daa
 
     return finish_loadboard(dapos, dacursectnum, numsprites, 0);
 }
-#endif
+
 
 #ifdef POLYMER
 void delete_maphack_lights()
diff --git a/polymer/eduke32/build/src/engine_oldmap.h b/polymer/eduke32/build/src/engine_oldmap.h
index 8a7d703b1..c4a009697 100644
--- a/polymer/eduke32/build/src/engine_oldmap.h
+++ b/polymer/eduke32/build/src/engine_oldmap.h
@@ -204,6 +204,9 @@ static void convertv6sectv7(struct sectortypev6 *from, sectortype *to)
     to->lotag = from->lotag;
     to->hitag = from->hitag;
     to->extra = from->extra;
+#ifdef NEW_MAP_FORMAT
+    to->ceilingbunch = to->floorbunch = -1;
+#endif
 }
 
 static void convertv6wallv7(struct walltypev6 *from, walltype *to)
@@ -225,6 +228,9 @@ static void convertv6wallv7(struct walltypev6 *from, walltype *to)
     to->lotag = from->lotag;
     to->hitag = from->hitag;
     to->extra = from->extra;
+#ifdef NEW_MAP_FORMAT
+    to->upwall = to->dnwall = -1;
+#endif
 }
 
 static void convertv6sprv7(struct spritetypev6 *from, spritetype *to)