zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic (map-int VX) build: implement loading <V7 maps.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3710 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-04-25 21:10:22 +00:00
parent ac2379171c
commit a628cbdd13
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/build/include/build.h
View file

@ -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

3
polymer/eduke32/build/src/build.c
View file

@ -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.");

7
polymer/eduke32/build/src/engine.c
View file

@ -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()

6
polymer/eduke32/build/src/engine_oldmap.h
View file

@ -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)