mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-16 09:21:36 +00:00
Rip out v5/v6 map definitions and routines into src/engine_oldmap.h.
git-svn-id: https://svn.eduke32.com/eduke32@3043 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned
parent
9128e8af04
commit
7efc08a919
3 changed files with 257 additions and 253 deletions
|
|
@ -9,7 +9,7 @@ $(OBJ)/compat.$o: $(SRC)/compat.c $(INC)/compat.h
|
||||||
$(OBJ)/config.$o: $(SRC)/config.c $(INC)/compat.h $(INC)/osd.h $(INC)/editor.h
|
$(OBJ)/config.$o: $(SRC)/config.c $(INC)/compat.h $(INC)/osd.h $(INC)/editor.h
|
||||||
$(OBJ)/crc32.$o: $(SRC)/crc32.c $(INC)/crc32.h
|
$(OBJ)/crc32.$o: $(SRC)/crc32.c $(INC)/crc32.h
|
||||||
$(OBJ)/defs.$o: $(SRC)/defs.c $(INC)/build.h $(INC)/baselayer.h $(INC)/scriptfile.h $(INC)/compat.h
|
$(OBJ)/defs.$o: $(SRC)/defs.c $(INC)/build.h $(INC)/baselayer.h $(INC)/scriptfile.h $(INC)/compat.h
|
||||||
$(OBJ)/engine.$o: $(SRC)/engine.c $(INC)/compat.h $(INC)/build.h $(INC)/pragmas.h $(INC)/cache1d.h $(INC)/a.h $(INC)/osd.h $(INC)/baselayer.h $(SRC)/engine_priv.h $(INC)/polymost.h $(INC)/hightile.h $(INC)/mdsprite.h $(INC)/polymer.h
|
$(OBJ)/engine.$o: $(SRC)/engine.c $(INC)/compat.h $(INC)/build.h $(INC)/pragmas.h $(INC)/cache1d.h $(INC)/a.h $(INC)/osd.h $(INC)/baselayer.h $(SRC)/engine_priv.h $(SRC)/engine_oldmap.h $(INC)/polymost.h $(INC)/hightile.h $(INC)/mdsprite.h $(INC)/polymer.h
|
||||||
$(OBJ)/polymost.$o: $(SRC)/polymost.c $(INC)/md4.h $(INC)/quicklz.h $(INC)/lzwnew.h $(INC)/compat.h $(INC)/build.h $(SRC)/engine_priv.h $(INC)/polymost.h $(INC)/hightile.h $(INC)/mdsprite.h
|
$(OBJ)/polymost.$o: $(SRC)/polymost.c $(INC)/md4.h $(INC)/quicklz.h $(INC)/lzwnew.h $(INC)/compat.h $(INC)/build.h $(SRC)/engine_priv.h $(INC)/polymost.h $(INC)/hightile.h $(INC)/mdsprite.h
|
||||||
$(OBJ)/hightile.$o: $(SRC)/hightile.c $(INC)/kplib.h $(INC)/hightile.h
|
$(OBJ)/hightile.$o: $(SRC)/hightile.c $(INC)/kplib.h $(INC)/hightile.h
|
||||||
$(OBJ)/mdsprite.$o: $(SRC)/mdsprite.c $(SRC)/engine_priv.h $(INC)/polymost.h $(INC)/hightile.h $(INC)/mdsprite.h
|
$(OBJ)/mdsprite.$o: $(SRC)/mdsprite.c $(SRC)/engine_priv.h $(INC)/polymost.h $(INC)/hightile.h $(INC)/mdsprite.h
|
||||||
|
|
|
||||||
|
|
@ -9485,259 +9485,8 @@ int32_t loadboard(char *filename, char flags, vec3_t *dapos, int16_t *daang, int
|
||||||
//
|
//
|
||||||
// loadboardv5/6
|
// loadboardv5/6
|
||||||
//
|
//
|
||||||
#pragma pack(push,1)
|
|
||||||
struct sectortypev5
|
|
||||||
{
|
|
||||||
uint16_t wallptr, wallnum;
|
|
||||||
int16_t ceilingpicnum, floorpicnum;
|
|
||||||
int16_t ceilingheinum, floorheinum;
|
|
||||||
int32_t ceilingz, floorz;
|
|
||||||
int8_t ceilingshade, floorshade;
|
|
||||||
char ceilingxpanning, floorxpanning;
|
|
||||||
char ceilingypanning, floorypanning;
|
|
||||||
char ceilingstat, floorstat;
|
|
||||||
char ceilingpal, floorpal;
|
|
||||||
char visibility;
|
|
||||||
int16_t lotag, hitag;
|
|
||||||
int16_t extra;
|
|
||||||
};
|
|
||||||
struct walltypev5
|
|
||||||
{
|
|
||||||
int32_t x, y;
|
|
||||||
int16_t point2;
|
|
||||||
int16_t picnum, overpicnum;
|
|
||||||
int8_t shade;
|
|
||||||
int16_t cstat;
|
|
||||||
char xrepeat, yrepeat, xpanning, ypanning;
|
|
||||||
int16_t nextsector1, nextwall1;
|
|
||||||
int16_t nextsector2, nextwall2;
|
|
||||||
int16_t lotag, hitag;
|
|
||||||
int16_t extra;
|
|
||||||
};
|
|
||||||
struct spritetypev5
|
|
||||||
{
|
|
||||||
int32_t x, y, z;
|
|
||||||
char cstat;
|
|
||||||
int8_t shade;
|
|
||||||
char xrepeat, yrepeat;
|
|
||||||
int16_t picnum, ang, xvel, yvel, zvel, owner;
|
|
||||||
int16_t sectnum, statnum;
|
|
||||||
int16_t lotag, hitag;
|
|
||||||
int16_t extra;
|
|
||||||
};
|
|
||||||
struct sectortypev6
|
|
||||||
{
|
|
||||||
uint16_t wallptr, wallnum;
|
|
||||||
int16_t ceilingpicnum, floorpicnum;
|
|
||||||
int16_t ceilingheinum, floorheinum;
|
|
||||||
int32_t ceilingz, floorz;
|
|
||||||
int8_t ceilingshade, floorshade;
|
|
||||||
char ceilingxpanning, floorxpanning;
|
|
||||||
char ceilingypanning, floorypanning;
|
|
||||||
char ceilingstat, floorstat;
|
|
||||||
char ceilingpal, floorpal;
|
|
||||||
char visibility;
|
|
||||||
int16_t lotag, hitag, extra;
|
|
||||||
};
|
|
||||||
struct walltypev6
|
|
||||||
{
|
|
||||||
int32_t x, y;
|
|
||||||
int16_t point2, nextsector, nextwall;
|
|
||||||
int16_t picnum, overpicnum;
|
|
||||||
int8_t shade;
|
|
||||||
char pal;
|
|
||||||
int16_t cstat;
|
|
||||||
char xrepeat, yrepeat, xpanning, ypanning;
|
|
||||||
int16_t lotag, hitag, extra;
|
|
||||||
};
|
|
||||||
struct spritetypev6
|
|
||||||
{
|
|
||||||
int32_t x, y, z;
|
|
||||||
int16_t cstat;
|
|
||||||
int8_t shade;
|
|
||||||
char pal, clipdist;
|
|
||||||
char xrepeat, yrepeat;
|
|
||||||
int8_t xoffset, yoffset;
|
|
||||||
int16_t picnum, ang, xvel, yvel, zvel, owner;
|
|
||||||
int16_t sectnum, statnum;
|
|
||||||
int16_t lotag, hitag, extra;
|
|
||||||
};
|
|
||||||
#pragma pack(pop)
|
|
||||||
|
|
||||||
static int16_t sectorofwallv5(int16_t theline)
|
#include "engine_oldmap.h"
|
||||||
{
|
|
||||||
int16_t i, startwall, endwall, sucksect;
|
|
||||||
|
|
||||||
sucksect = -1;
|
|
||||||
for (i=0; i<numsectors; i++)
|
|
||||||
{
|
|
||||||
startwall = sector[i].wallptr;
|
|
||||||
endwall = startwall + sector[i].wallnum - 1;
|
|
||||||
if ((theline >= startwall) && (theline <= endwall))
|
|
||||||
{
|
|
||||||
sucksect = i;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return(sucksect);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void convertv5sectv6(struct sectortypev5 *from, struct sectortypev6 *to)
|
|
||||||
{
|
|
||||||
to->wallptr = from->wallptr;
|
|
||||||
to->wallnum = from->wallnum;
|
|
||||||
to->ceilingpicnum = from->ceilingpicnum;
|
|
||||||
to->floorpicnum = from->floorpicnum;
|
|
||||||
to->ceilingheinum = from->ceilingheinum;
|
|
||||||
to->floorheinum = from->floorheinum;
|
|
||||||
to->ceilingz = from->ceilingz;
|
|
||||||
to->floorz = from->floorz;
|
|
||||||
to->ceilingshade = from->ceilingshade;
|
|
||||||
to->floorshade = from->floorshade;
|
|
||||||
to->ceilingxpanning = from->ceilingxpanning;
|
|
||||||
to->floorxpanning = from->floorxpanning;
|
|
||||||
to->ceilingypanning = from->ceilingypanning;
|
|
||||||
to->floorypanning = from->floorypanning;
|
|
||||||
to->ceilingstat = from->ceilingstat;
|
|
||||||
to->floorstat = from->floorstat;
|
|
||||||
to->ceilingpal = from->ceilingpal;
|
|
||||||
to->floorpal = from->floorpal;
|
|
||||||
to->visibility = from->visibility;
|
|
||||||
to->lotag = from->lotag;
|
|
||||||
to->hitag = from->hitag;
|
|
||||||
to->extra = from->extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void convertv5wallv6(struct walltypev5 *from, struct walltypev6 *to, int32_t i)
|
|
||||||
{
|
|
||||||
to->x = from->x;
|
|
||||||
to->y = from->y;
|
|
||||||
to->point2 = from->point2;
|
|
||||||
to->nextsector = from->nextsector1;
|
|
||||||
to->nextwall = from->nextwall1;
|
|
||||||
to->picnum = from->picnum;
|
|
||||||
to->overpicnum = from->overpicnum;
|
|
||||||
to->shade = from->shade;
|
|
||||||
to->pal = sector[sectorofwallv5((int16_t)i)].floorpal;
|
|
||||||
to->cstat = from->cstat;
|
|
||||||
to->xrepeat = from->xrepeat;
|
|
||||||
to->yrepeat = from->yrepeat;
|
|
||||||
to->xpanning = from->xpanning;
|
|
||||||
to->ypanning = from->ypanning;
|
|
||||||
to->lotag = from->lotag;
|
|
||||||
to->hitag = from->hitag;
|
|
||||||
to->extra = from->extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void convertv5sprv6(struct spritetypev5 *from, struct spritetypev6 *to)
|
|
||||||
{
|
|
||||||
int16_t j;
|
|
||||||
to->x = from->x;
|
|
||||||
to->y = from->y;
|
|
||||||
to->z = from->z;
|
|
||||||
to->cstat = from->cstat;
|
|
||||||
to->shade = from->shade;
|
|
||||||
|
|
||||||
j = from->sectnum;
|
|
||||||
if ((sector[j].ceilingstat&1) > 0)
|
|
||||||
to->pal = sector[j].ceilingpal;
|
|
||||||
else
|
|
||||||
to->pal = sector[j].floorpal;
|
|
||||||
|
|
||||||
to->clipdist = 32;
|
|
||||||
to->xrepeat = from->xrepeat;
|
|
||||||
to->yrepeat = from->yrepeat;
|
|
||||||
to->xoffset = 0;
|
|
||||||
to->yoffset = 0;
|
|
||||||
to->picnum = from->picnum;
|
|
||||||
to->ang = from->ang;
|
|
||||||
to->xvel = from->xvel;
|
|
||||||
to->yvel = from->yvel;
|
|
||||||
to->zvel = from->zvel;
|
|
||||||
to->owner = from->owner;
|
|
||||||
to->sectnum = from->sectnum;
|
|
||||||
to->statnum = from->statnum;
|
|
||||||
to->lotag = from->lotag;
|
|
||||||
to->hitag = from->hitag;
|
|
||||||
to->extra = from->extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void convertv6sectv7(struct sectortypev6 *from, sectortype *to)
|
|
||||||
{
|
|
||||||
to->ceilingz = from->ceilingz;
|
|
||||||
to->floorz = from->floorz;
|
|
||||||
to->wallptr = from->wallptr;
|
|
||||||
to->wallnum = from->wallnum;
|
|
||||||
to->ceilingpicnum = from->ceilingpicnum;
|
|
||||||
to->ceilingheinum = max(min(((int32_t)from->ceilingheinum)<<5,32767),-32768);
|
|
||||||
if ((from->ceilingstat&2) == 0) to->ceilingheinum = 0;
|
|
||||||
to->ceilingshade = from->ceilingshade;
|
|
||||||
to->ceilingpal = from->ceilingpal;
|
|
||||||
to->ceilingxpanning = from->ceilingxpanning;
|
|
||||||
to->ceilingypanning = from->ceilingypanning;
|
|
||||||
to->floorpicnum = from->floorpicnum;
|
|
||||||
to->floorheinum = max(min(((int32_t)from->floorheinum)<<5,32767),-32768);
|
|
||||||
if ((from->floorstat&2) == 0) to->floorheinum = 0;
|
|
||||||
to->floorshade = from->floorshade;
|
|
||||||
to->floorpal = from->floorpal;
|
|
||||||
to->floorxpanning = from->floorxpanning;
|
|
||||||
to->floorypanning = from->floorypanning;
|
|
||||||
to->ceilingstat = from->ceilingstat;
|
|
||||||
to->floorstat = from->floorstat;
|
|
||||||
to->visibility = from->visibility;
|
|
||||||
to->filler = 0;
|
|
||||||
to->lotag = from->lotag;
|
|
||||||
to->hitag = from->hitag;
|
|
||||||
to->extra = from->extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void convertv6wallv7(struct walltypev6 *from, walltype *to)
|
|
||||||
{
|
|
||||||
to->x = from->x;
|
|
||||||
to->y = from->y;
|
|
||||||
to->point2 = from->point2;
|
|
||||||
to->nextwall = from->nextwall;
|
|
||||||
to->nextsector = from->nextsector;
|
|
||||||
to->cstat = from->cstat;
|
|
||||||
to->picnum = from->picnum;
|
|
||||||
to->overpicnum = from->overpicnum;
|
|
||||||
to->shade = from->shade;
|
|
||||||
to->pal = from->pal;
|
|
||||||
to->xrepeat = from->xrepeat;
|
|
||||||
to->yrepeat = from->yrepeat;
|
|
||||||
to->xpanning = from->xpanning;
|
|
||||||
to->ypanning = from->ypanning;
|
|
||||||
to->lotag = from->lotag;
|
|
||||||
to->hitag = from->hitag;
|
|
||||||
to->extra = from->extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void convertv6sprv7(struct spritetypev6 *from, spritetype *to)
|
|
||||||
{
|
|
||||||
to->x = from->x;
|
|
||||||
to->y = from->y;
|
|
||||||
to->z = from->z;
|
|
||||||
to->cstat = from->cstat;
|
|
||||||
to->picnum = from->picnum;
|
|
||||||
to->shade = from->shade;
|
|
||||||
to->pal = from->pal;
|
|
||||||
to->clipdist = from->clipdist;
|
|
||||||
to->filler = 0;
|
|
||||||
to->xrepeat = from->xrepeat;
|
|
||||||
to->yrepeat = from->yrepeat;
|
|
||||||
to->xoffset = from->xoffset;
|
|
||||||
to->yoffset = from->yoffset;
|
|
||||||
to->sectnum = from->sectnum;
|
|
||||||
to->statnum = from->statnum;
|
|
||||||
to->ang = from->ang;
|
|
||||||
to->owner = from->owner;
|
|
||||||
to->xvel = from->xvel;
|
|
||||||
to->yvel = from->yvel;
|
|
||||||
to->zvel = from->zvel;
|
|
||||||
to->lotag = from->lotag;
|
|
||||||
to->hitag = from->hitag;
|
|
||||||
to->extra = from->extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Powerslave uses v6
|
// Powerslave uses v6
|
||||||
// Witchaven 1 and TekWar and LameDuke use v5
|
// Witchaven 1 and TekWar and LameDuke use v5
|
||||||
|
|
|
||||||
255
polymer/eduke32/build/src/engine_oldmap.h
Normal file
255
polymer/eduke32/build/src/engine_oldmap.h
Normal file
|
|
@ -0,0 +1,255 @@
|
||||||
|
/* For single inclusion into engine.c only! */
|
||||||
|
|
||||||
|
#pragma pack(push,1)
|
||||||
|
struct sectortypev5
|
||||||
|
{
|
||||||
|
uint16_t wallptr, wallnum;
|
||||||
|
int16_t ceilingpicnum, floorpicnum;
|
||||||
|
int16_t ceilingheinum, floorheinum;
|
||||||
|
int32_t ceilingz, floorz;
|
||||||
|
int8_t ceilingshade, floorshade;
|
||||||
|
char ceilingxpanning, floorxpanning;
|
||||||
|
char ceilingypanning, floorypanning;
|
||||||
|
char ceilingstat, floorstat;
|
||||||
|
char ceilingpal, floorpal;
|
||||||
|
char visibility;
|
||||||
|
int16_t lotag, hitag;
|
||||||
|
int16_t extra;
|
||||||
|
};
|
||||||
|
struct walltypev5
|
||||||
|
{
|
||||||
|
int32_t x, y;
|
||||||
|
int16_t point2;
|
||||||
|
int16_t picnum, overpicnum;
|
||||||
|
int8_t shade;
|
||||||
|
int16_t cstat;
|
||||||
|
char xrepeat, yrepeat, xpanning, ypanning;
|
||||||
|
int16_t nextsector1, nextwall1;
|
||||||
|
int16_t nextsector2, nextwall2;
|
||||||
|
int16_t lotag, hitag;
|
||||||
|
int16_t extra;
|
||||||
|
};
|
||||||
|
struct spritetypev5
|
||||||
|
{
|
||||||
|
int32_t x, y, z;
|
||||||
|
char cstat;
|
||||||
|
int8_t shade;
|
||||||
|
char xrepeat, yrepeat;
|
||||||
|
int16_t picnum, ang, xvel, yvel, zvel, owner;
|
||||||
|
int16_t sectnum, statnum;
|
||||||
|
int16_t lotag, hitag;
|
||||||
|
int16_t extra;
|
||||||
|
};
|
||||||
|
struct sectortypev6
|
||||||
|
{
|
||||||
|
uint16_t wallptr, wallnum;
|
||||||
|
int16_t ceilingpicnum, floorpicnum;
|
||||||
|
int16_t ceilingheinum, floorheinum;
|
||||||
|
int32_t ceilingz, floorz;
|
||||||
|
int8_t ceilingshade, floorshade;
|
||||||
|
char ceilingxpanning, floorxpanning;
|
||||||
|
char ceilingypanning, floorypanning;
|
||||||
|
char ceilingstat, floorstat;
|
||||||
|
char ceilingpal, floorpal;
|
||||||
|
char visibility;
|
||||||
|
int16_t lotag, hitag, extra;
|
||||||
|
};
|
||||||
|
struct walltypev6
|
||||||
|
{
|
||||||
|
int32_t x, y;
|
||||||
|
int16_t point2, nextsector, nextwall;
|
||||||
|
int16_t picnum, overpicnum;
|
||||||
|
int8_t shade;
|
||||||
|
char pal;
|
||||||
|
int16_t cstat;
|
||||||
|
char xrepeat, yrepeat, xpanning, ypanning;
|
||||||
|
int16_t lotag, hitag, extra;
|
||||||
|
};
|
||||||
|
struct spritetypev6
|
||||||
|
{
|
||||||
|
int32_t x, y, z;
|
||||||
|
int16_t cstat;
|
||||||
|
int8_t shade;
|
||||||
|
char pal, clipdist;
|
||||||
|
char xrepeat, yrepeat;
|
||||||
|
int8_t xoffset, yoffset;
|
||||||
|
int16_t picnum, ang, xvel, yvel, zvel, owner;
|
||||||
|
int16_t sectnum, statnum;
|
||||||
|
int16_t lotag, hitag, extra;
|
||||||
|
};
|
||||||
|
#pragma pack(pop)
|
||||||
|
|
||||||
|
static int16_t sectorofwallv5(int16_t theline)
|
||||||
|
{
|
||||||
|
int16_t i, startwall, endwall, sucksect;
|
||||||
|
|
||||||
|
sucksect = -1;
|
||||||
|
for (i=0; i<numsectors; i++)
|
||||||
|
{
|
||||||
|
startwall = sector[i].wallptr;
|
||||||
|
endwall = startwall + sector[i].wallnum - 1;
|
||||||
|
if ((theline >= startwall) && (theline <= endwall))
|
||||||
|
{
|
||||||
|
sucksect = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return(sucksect);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void convertv5sectv6(struct sectortypev5 *from, struct sectortypev6 *to)
|
||||||
|
{
|
||||||
|
to->wallptr = from->wallptr;
|
||||||
|
to->wallnum = from->wallnum;
|
||||||
|
to->ceilingpicnum = from->ceilingpicnum;
|
||||||
|
to->floorpicnum = from->floorpicnum;
|
||||||
|
to->ceilingheinum = from->ceilingheinum;
|
||||||
|
to->floorheinum = from->floorheinum;
|
||||||
|
to->ceilingz = from->ceilingz;
|
||||||
|
to->floorz = from->floorz;
|
||||||
|
to->ceilingshade = from->ceilingshade;
|
||||||
|
to->floorshade = from->floorshade;
|
||||||
|
to->ceilingxpanning = from->ceilingxpanning;
|
||||||
|
to->floorxpanning = from->floorxpanning;
|
||||||
|
to->ceilingypanning = from->ceilingypanning;
|
||||||
|
to->floorypanning = from->floorypanning;
|
||||||
|
to->ceilingstat = from->ceilingstat;
|
||||||
|
to->floorstat = from->floorstat;
|
||||||
|
to->ceilingpal = from->ceilingpal;
|
||||||
|
to->floorpal = from->floorpal;
|
||||||
|
to->visibility = from->visibility;
|
||||||
|
to->lotag = from->lotag;
|
||||||
|
to->hitag = from->hitag;
|
||||||
|
to->extra = from->extra;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void convertv5wallv6(struct walltypev5 *from, struct walltypev6 *to, int32_t i)
|
||||||
|
{
|
||||||
|
to->x = from->x;
|
||||||
|
to->y = from->y;
|
||||||
|
to->point2 = from->point2;
|
||||||
|
to->nextsector = from->nextsector1;
|
||||||
|
to->nextwall = from->nextwall1;
|
||||||
|
to->picnum = from->picnum;
|
||||||
|
to->overpicnum = from->overpicnum;
|
||||||
|
to->shade = from->shade;
|
||||||
|
to->pal = sector[sectorofwallv5((int16_t)i)].floorpal;
|
||||||
|
to->cstat = from->cstat;
|
||||||
|
to->xrepeat = from->xrepeat;
|
||||||
|
to->yrepeat = from->yrepeat;
|
||||||
|
to->xpanning = from->xpanning;
|
||||||
|
to->ypanning = from->ypanning;
|
||||||
|
to->lotag = from->lotag;
|
||||||
|
to->hitag = from->hitag;
|
||||||
|
to->extra = from->extra;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void convertv5sprv6(struct spritetypev5 *from, struct spritetypev6 *to)
|
||||||
|
{
|
||||||
|
int16_t j;
|
||||||
|
to->x = from->x;
|
||||||
|
to->y = from->y;
|
||||||
|
to->z = from->z;
|
||||||
|
to->cstat = from->cstat;
|
||||||
|
to->shade = from->shade;
|
||||||
|
|
||||||
|
j = from->sectnum;
|
||||||
|
if ((sector[j].ceilingstat&1) > 0)
|
||||||
|
to->pal = sector[j].ceilingpal;
|
||||||
|
else
|
||||||
|
to->pal = sector[j].floorpal;
|
||||||
|
|
||||||
|
to->clipdist = 32;
|
||||||
|
to->xrepeat = from->xrepeat;
|
||||||
|
to->yrepeat = from->yrepeat;
|
||||||
|
to->xoffset = 0;
|
||||||
|
to->yoffset = 0;
|
||||||
|
to->picnum = from->picnum;
|
||||||
|
to->ang = from->ang;
|
||||||
|
to->xvel = from->xvel;
|
||||||
|
to->yvel = from->yvel;
|
||||||
|
to->zvel = from->zvel;
|
||||||
|
to->owner = from->owner;
|
||||||
|
to->sectnum = from->sectnum;
|
||||||
|
to->statnum = from->statnum;
|
||||||
|
to->lotag = from->lotag;
|
||||||
|
to->hitag = from->hitag;
|
||||||
|
to->extra = from->extra;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void convertv6sectv7(struct sectortypev6 *from, sectortype *to)
|
||||||
|
{
|
||||||
|
to->ceilingz = from->ceilingz;
|
||||||
|
to->floorz = from->floorz;
|
||||||
|
to->wallptr = from->wallptr;
|
||||||
|
to->wallnum = from->wallnum;
|
||||||
|
to->ceilingpicnum = from->ceilingpicnum;
|
||||||
|
to->ceilingheinum = max(min(((int32_t)from->ceilingheinum)<<5,32767),-32768);
|
||||||
|
if ((from->ceilingstat&2) == 0) to->ceilingheinum = 0;
|
||||||
|
to->ceilingshade = from->ceilingshade;
|
||||||
|
to->ceilingpal = from->ceilingpal;
|
||||||
|
to->ceilingxpanning = from->ceilingxpanning;
|
||||||
|
to->ceilingypanning = from->ceilingypanning;
|
||||||
|
to->floorpicnum = from->floorpicnum;
|
||||||
|
to->floorheinum = max(min(((int32_t)from->floorheinum)<<5,32767),-32768);
|
||||||
|
if ((from->floorstat&2) == 0) to->floorheinum = 0;
|
||||||
|
to->floorshade = from->floorshade;
|
||||||
|
to->floorpal = from->floorpal;
|
||||||
|
to->floorxpanning = from->floorxpanning;
|
||||||
|
to->floorypanning = from->floorypanning;
|
||||||
|
to->ceilingstat = from->ceilingstat;
|
||||||
|
to->floorstat = from->floorstat;
|
||||||
|
to->visibility = from->visibility;
|
||||||
|
to->filler = 0;
|
||||||
|
to->lotag = from->lotag;
|
||||||
|
to->hitag = from->hitag;
|
||||||
|
to->extra = from->extra;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void convertv6wallv7(struct walltypev6 *from, walltype *to)
|
||||||
|
{
|
||||||
|
to->x = from->x;
|
||||||
|
to->y = from->y;
|
||||||
|
to->point2 = from->point2;
|
||||||
|
to->nextwall = from->nextwall;
|
||||||
|
to->nextsector = from->nextsector;
|
||||||
|
to->cstat = from->cstat;
|
||||||
|
to->picnum = from->picnum;
|
||||||
|
to->overpicnum = from->overpicnum;
|
||||||
|
to->shade = from->shade;
|
||||||
|
to->pal = from->pal;
|
||||||
|
to->xrepeat = from->xrepeat;
|
||||||
|
to->yrepeat = from->yrepeat;
|
||||||
|
to->xpanning = from->xpanning;
|
||||||
|
to->ypanning = from->ypanning;
|
||||||
|
to->lotag = from->lotag;
|
||||||
|
to->hitag = from->hitag;
|
||||||
|
to->extra = from->extra;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void convertv6sprv7(struct spritetypev6 *from, spritetype *to)
|
||||||
|
{
|
||||||
|
to->x = from->x;
|
||||||
|
to->y = from->y;
|
||||||
|
to->z = from->z;
|
||||||
|
to->cstat = from->cstat;
|
||||||
|
to->picnum = from->picnum;
|
||||||
|
to->shade = from->shade;
|
||||||
|
to->pal = from->pal;
|
||||||
|
to->clipdist = from->clipdist;
|
||||||
|
to->filler = 0;
|
||||||
|
to->xrepeat = from->xrepeat;
|
||||||
|
to->yrepeat = from->yrepeat;
|
||||||
|
to->xoffset = from->xoffset;
|
||||||
|
to->yoffset = from->yoffset;
|
||||||
|
to->sectnum = from->sectnum;
|
||||||
|
to->statnum = from->statnum;
|
||||||
|
to->ang = from->ang;
|
||||||
|
to->owner = from->owner;
|
||||||
|
to->xvel = from->xvel;
|
||||||
|
to->yvel = from->yvel;
|
||||||
|
to->zvel = from->zvel;
|
||||||
|
to->lotag = from->lotag;
|
||||||
|
to->hitag = from->hitag;
|
||||||
|
to->extra = from->extra;
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue