mirror of
https://github.com/ZDoom/Raze.git
synced 2025-06-04 19:20:43 +00:00
- rewrote map loader to work independently of data structure sizes.
This is needed to extend a few fields that are too narrow - e.g. the texture offset fields have no room for interpolating scrolling textures. Blood not done yet, will also need to be changed to get rid of the limits.
This commit is contained in:
Christoph Oelckers
parent
28c5c72605
commit
880b811e0d
10 changed files with 446 additions and 833 deletions
|
|
@ -39,9 +39,6 @@
|
|||
#endif
|
||||
|
||||
|
||||
int32_t mapversion=7; // JBF 20040211: default mapversion to 7
|
||||
int32_t g_loadedMapVersion = -1; // -1: none (e.g. started new)
|
||||
|
||||
int32_t rendmode=0;
|
||||
int32_t glrendmode = REND_POLYMOST;
|
||||
int32_t r_rortexture = 0;
|
||||
|
|
@ -1934,499 +1931,6 @@ void renderDrawMapView(int32_t dax, int32_t day, int32_t zoome, int16_t ang)
|
|||
renderSetAspect(oviewingrange, oyxaspect);
|
||||
}
|
||||
|
||||
//////////////////// LOADING AND SAVING ROUTINES ////////////////////
|
||||
|
||||
static FORCE_INLINE int32_t have_maptext(void)
|
||||
{
|
||||
return (mapversion >= 10);
|
||||
}
|
||||
|
||||
static void enginePrepareLoadBoard(FileReader & fr, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum)
|
||||
{
|
||||
memset(spriteext, 0, sizeof(spriteext_t) * MAXSPRITES);
|
||||
memset(spritesmooth, 0, sizeof(spritesmooth_t) * (MAXSPRITES + MAXUNIQHUDID));
|
||||
|
||||
initspritelists();
|
||||
ClearAutomap();
|
||||
|
||||
#ifdef USE_OPENGL
|
||||
Polymost_prepare_loadboard();
|
||||
#endif
|
||||
|
||||
if (!have_maptext())
|
||||
{
|
||||
fr.Read(&dapos->x,4); dapos->x = B_LITTLE32(dapos->x);
|
||||
fr.Read(&dapos->y,4); dapos->y = B_LITTLE32(dapos->y);
|
||||
fr.Read(&dapos->z,4); dapos->z = B_LITTLE32(dapos->z);
|
||||
fr.Read(daang,2); *daang = B_LITTLE16(*daang) & 2047;
|
||||
fr.Read(dacursectnum,2); *dacursectnum = B_LITTLE16(*dacursectnum);
|
||||
}
|
||||
}
|
||||
|
||||
static int32_t engineFinishLoadBoard(const char *filename, const vec3_t *dapos, int16_t *dacursectnum, int16_t numsprites, char myflags)
|
||||
{
|
||||
int32_t i, realnumsprites=numsprites, numremoved;
|
||||
|
||||
#if !defined USE_OPENGL || !defined POLYMER
|
||||
UNREFERENCED_PARAMETER(myflags);
|
||||
#endif
|
||||
|
||||
for (i=0; i<numsprites; i++)
|
||||
{
|
||||
int32_t removeit = 0;
|
||||
|
||||
if ((sprite[i].cstat & 48) == 48)
|
||||
sprite[i].cstat &= ~48;
|
||||
|
||||
if (sprite[i].statnum == MAXSTATUS)
|
||||
{
|
||||
// Sprite was removed in loadboard() -> check_sprite(). Insert it
|
||||
// for now, because we must maintain the sprite numbering.
|
||||
sprite[i].statnum = sprite[i].sectnum = 0;
|
||||
removeit = 1;
|
||||
}
|
||||
|
||||
insertsprite(sprite[i].sectnum, sprite[i].statnum);
|
||||
|
||||
if (removeit)
|
||||
{
|
||||
// Flag .statnum==MAXSTATUS, temporarily creating an inconsistency
|
||||
// with sprite list.
|
||||
sprite[i].statnum = MAXSTATUS;
|
||||
realnumsprites--;
|
||||
}
|
||||
}
|
||||
|
||||
if (numsprites != realnumsprites)
|
||||
{
|
||||
for (i=0; i<numsprites; i++)
|
||||
if (sprite[i].statnum == MAXSTATUS)
|
||||
{
|
||||
// Now remove it for real!
|
||||
sprite[i].statnum = 0;
|
||||
deletesprite(i);
|
||||
}
|
||||
}
|
||||
|
||||
numremoved = (numsprites-realnumsprites);
|
||||
numsprites = realnumsprites;
|
||||
assert(numsprites == Numsprites);
|
||||
|
||||
//Must be after loading sectors, etc!
|
||||
updatesector(dapos->x, dapos->y, dacursectnum);
|
||||
|
||||
{
|
||||
memset(spriteext, 0, sizeof(spriteext_t)*MAXSPRITES);
|
||||
memset(wallext, 0, sizeof(wallext_t)*MAXWALLS);
|
||||
memset(spritesmooth, 0, sizeof(spritesmooth_t)*(MAXSPRITES+MAXUNIQHUDID));
|
||||
}
|
||||
|
||||
guniqhudid = 0;
|
||||
|
||||
G_LoadMapHack(filename);
|
||||
|
||||
return numremoved;
|
||||
}
|
||||
|
||||
|
||||
#define MYMAXSECTORS() (MAXSECTORS==MAXSECTORSV7 || mapversion <= 7 ? MAXSECTORSV7 : MAXSECTORSV8)
|
||||
#define MYMAXWALLS() (MAXSECTORS==MAXSECTORSV7 || mapversion <= 7 ? MAXWALLSV7 : MAXWALLSV8)
|
||||
#define MYMAXSPRITES() (MAXSECTORS==MAXSECTORSV7 || mapversion <= 7 ? MAXSPRITESV7 : MAXSPRITESV8)
|
||||
|
||||
// Sprite checking
|
||||
|
||||
static void remove_sprite(int32_t i)
|
||||
{
|
||||
memset(&sprite[i], 0, sizeof(spritetype));
|
||||
sprite[i].statnum = MAXSTATUS;
|
||||
sprite[i].sectnum = MAXSECTORS;
|
||||
}
|
||||
|
||||
// This is only to be run after reading the sprite array!
|
||||
static void check_sprite(int32_t i)
|
||||
{
|
||||
if ((unsigned)sprite[i].statnum >= MAXSTATUS)
|
||||
{
|
||||
Printf("Map error: sprite #%d (%d,%d) with illegal statnum (%d) REMOVED.\n",
|
||||
i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y), TrackerCast(sprite[i].statnum));
|
||||
remove_sprite(i);
|
||||
}
|
||||
else if ((unsigned)sprite[i].picnum >= MAXTILES)
|
||||
{
|
||||
Printf("Map error: sprite #%d (%d,%d) with illegal picnum (%d) REMOVED.\n",
|
||||
i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y), TrackerCast(sprite[i].sectnum));
|
||||
remove_sprite(i);
|
||||
}
|
||||
else if ((unsigned)sprite[i].sectnum >= (unsigned)numsectors)
|
||||
{
|
||||
const int32_t osectnum = sprite[i].sectnum;
|
||||
|
||||
sprite[i].sectnum = -1;
|
||||
updatesector(sprite[i].x, sprite[i].y, &sprite[i].sectnum);
|
||||
|
||||
if (sprite[i].sectnum < 0)
|
||||
remove_sprite(i);
|
||||
|
||||
Printf("Map error: sprite #%d (%d,%d) with illegal sector (%d) ",
|
||||
i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y), osectnum);
|
||||
|
||||
if (sprite[i].statnum != MAXSTATUS)
|
||||
Printf("changed to sector %d.\n", TrackerCast(sprite[i].sectnum));
|
||||
else
|
||||
Printf("REMOVED.\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#include "md4.h"
|
||||
|
||||
// flags: 1, 2: former parameter "fromwhere"
|
||||
// 4: don't call polymer_loadboard
|
||||
// 8: don't autoexec <mapname>.cfg
|
||||
// returns: on success, number of removed sprites
|
||||
// -1: file not found
|
||||
// -2: invalid version
|
||||
// -3: invalid number of sectors, walls or sprites
|
||||
// <= -4: map-text error
|
||||
int32_t engineLoadBoard(const char *filename, char flags, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum)
|
||||
{
|
||||
inputState.ClearAllInput();
|
||||
int32_t i;
|
||||
int16_t numsprites;
|
||||
const char myflags = flags&(~3);
|
||||
|
||||
flags &= 3;
|
||||
|
||||
FileReader fr = fileSystem.OpenFileReader(filename);
|
||||
if (!fr.isOpen())
|
||||
{ mapversion = 7; return -1; }
|
||||
|
||||
if (fr.Read(&mapversion, 4) != 4)
|
||||
{
|
||||
return -2;
|
||||
}
|
||||
|
||||
{
|
||||
int32_t ok = 0;
|
||||
|
||||
{
|
||||
// Not map-text. We expect a little-endian version int now.
|
||||
mapversion = B_LITTLE32(mapversion);
|
||||
#if MAXSECTORS==MAXSECTORSV8
|
||||
// v8 engine
|
||||
ok |= (mapversion==8);
|
||||
#endif
|
||||
ok |= (mapversion==7);
|
||||
}
|
||||
|
||||
if (!ok)
|
||||
{
|
||||
return -2;
|
||||
}
|
||||
}
|
||||
|
||||
enginePrepareLoadBoard(fr, dapos, daang, dacursectnum);
|
||||
|
||||
|
||||
////////// Read sectors //////////
|
||||
|
||||
fr.Read(&numsectors,2); numsectors = B_LITTLE16(numsectors);
|
||||
if ((unsigned)numsectors >= MYMAXSECTORS() + 1)
|
||||
{
|
||||
error:
|
||||
numsectors = 0;
|
||||
numwalls = 0;
|
||||
numsprites = 0;
|
||||
return -3;
|
||||
}
|
||||
|
||||
fr.Read(sector, sizeof(sectortypev7)*numsectors);
|
||||
|
||||
for (i=numsectors-1; i>=0; i--)
|
||||
{
|
||||
sector[i].wallptr = B_LITTLE16(sector[i].wallptr);
|
||||
sector[i].wallnum = B_LITTLE16(sector[i].wallnum);
|
||||
sector[i].ceilingz = B_LITTLE32(sector[i].ceilingz);
|
||||
sector[i].floorz = B_LITTLE32(sector[i].floorz);
|
||||
sector[i].ceilingstat = B_LITTLE16(sector[i].ceilingstat);
|
||||
sector[i].floorstat = B_LITTLE16(sector[i].floorstat);
|
||||
sector[i].ceilingpicnum = B_LITTLE16(sector[i].ceilingpicnum);
|
||||
sector[i].ceilingheinum = B_LITTLE16(sector[i].ceilingheinum);
|
||||
sector[i].floorpicnum = B_LITTLE16(sector[i].floorpicnum);
|
||||
sector[i].floorheinum = B_LITTLE16(sector[i].floorheinum);
|
||||
sector[i].lotag = B_LITTLE16(sector[i].lotag);
|
||||
sector[i].hitag = B_LITTLE16(sector[i].hitag);
|
||||
sector[i].extra = B_LITTLE16(sector[i].extra);
|
||||
}
|
||||
|
||||
|
||||
////////// Read walls //////////
|
||||
|
||||
fr.Read(&numwalls,2); numwalls = B_LITTLE16(numwalls);
|
||||
if ((unsigned)numwalls >= MYMAXWALLS()+1) goto error;
|
||||
|
||||
fr.Read( wall, sizeof(walltypev7)*numwalls);
|
||||
|
||||
for (i=numwalls-1; i>=0; i--)
|
||||
{
|
||||
wall[i].x = B_LITTLE32(wall[i].x);
|
||||
wall[i].y = B_LITTLE32(wall[i].y);
|
||||
wall[i].point2 = B_LITTLE16(wall[i].point2);
|
||||
wall[i].nextwall = B_LITTLE16(wall[i].nextwall);
|
||||
wall[i].nextsector = B_LITTLE16(wall[i].nextsector);
|
||||
wall[i].cstat = B_LITTLE16(wall[i].cstat);
|
||||
wall[i].picnum = B_LITTLE16(wall[i].picnum);
|
||||
wall[i].overpicnum = B_LITTLE16(wall[i].overpicnum);
|
||||
wall[i].lotag = B_LITTLE16(wall[i].lotag);
|
||||
wall[i].hitag = B_LITTLE16(wall[i].hitag);
|
||||
wall[i].extra = B_LITTLE16(wall[i].extra);
|
||||
}
|
||||
|
||||
|
||||
////////// Read sprites //////////
|
||||
|
||||
fr.Read(&numsprites,2); numsprites = B_LITTLE16(numsprites);
|
||||
if ((unsigned)numsprites >= MYMAXSPRITES()+1) goto error;
|
||||
|
||||
fr.Read( sprite, sizeof(spritetype)*numsprites);
|
||||
|
||||
fr.Seek(0, FileReader::SeekSet);
|
||||
auto buffer = fr.Read();
|
||||
md4once(buffer.Data(), buffer.Size(), g_loadedMapHack.md4);
|
||||
|
||||
// Done reading file.
|
||||
|
||||
if (!have_maptext())
|
||||
{
|
||||
for (i=numsprites-1; i>=0; i--)
|
||||
{
|
||||
sprite[i].x = B_LITTLE32(sprite[i].x);
|
||||
sprite[i].y = B_LITTLE32(sprite[i].y);
|
||||
sprite[i].z = B_LITTLE32(sprite[i].z);
|
||||
sprite[i].cstat = B_LITTLE16(sprite[i].cstat);
|
||||
sprite[i].picnum = B_LITTLE16(sprite[i].picnum);
|
||||
sprite[i].sectnum = B_LITTLE16(sprite[i].sectnum);
|
||||
sprite[i].statnum = B_LITTLE16(sprite[i].statnum);
|
||||
sprite[i].ang = B_LITTLE16(sprite[i].ang);
|
||||
sprite[i].owner = B_LITTLE16(sprite[i].owner);
|
||||
sprite[i].xvel = B_LITTLE16(sprite[i].xvel);
|
||||
sprite[i].yvel = B_LITTLE16(sprite[i].yvel);
|
||||
sprite[i].zvel = B_LITTLE16(sprite[i].zvel);
|
||||
sprite[i].lotag = B_LITTLE16(sprite[i].lotag);
|
||||
sprite[i].hitag = B_LITTLE16(sprite[i].hitag);
|
||||
sprite[i].extra = B_LITTLE16(sprite[i].extra);
|
||||
|
||||
check_sprite(i);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i=numsprites-1; i>=0; i--)
|
||||
check_sprite(i);
|
||||
}
|
||||
|
||||
// Back up the map version of the *loaded* map. Must be before yax_update().
|
||||
g_loadedMapVersion = mapversion;
|
||||
|
||||
if ((myflags&8)==0)
|
||||
{
|
||||
// Per-map ART
|
||||
artSetupMapArt(filename);
|
||||
}
|
||||
|
||||
return engineFinishLoadBoard(filename, dapos, dacursectnum, numsprites, myflags);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// loadboardv5/6
|
||||
//
|
||||
#include "engine_oldmap.h"
|
||||
|
||||
// Powerslave uses v6
|
||||
// Witchaven 1 and TekWar and LameDuke use v5
|
||||
int32_t engineLoadBoardV5V6(const char *filename, char fromwhere, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum)
|
||||
{
|
||||
int32_t i;
|
||||
int16_t numsprites;
|
||||
|
||||
struct sectortypev5 v5sect;
|
||||
struct walltypev5 v5wall;
|
||||
struct spritetypev5 v5spr;
|
||||
struct sectortypev6 v6sect;
|
||||
struct walltypev6 v6wall;
|
||||
struct spritetypev6 v6spr;
|
||||
|
||||
FileReader fr = fileSystem.OpenFileReader(filename);
|
||||
if (!fr.isOpen())
|
||||
{ mapversion = 5L; return -1; }
|
||||
|
||||
fr.Read(&mapversion,4); mapversion = B_LITTLE32(mapversion);
|
||||
if (mapversion != 5L && mapversion != 6L) { return -2; }
|
||||
|
||||
enginePrepareLoadBoard(fr, dapos, daang, dacursectnum);
|
||||
|
||||
fr.Read(&numsectors,2); numsectors = B_LITTLE16(numsectors);
|
||||
if (numsectors > MAXSECTORS) { return -1; }
|
||||
for (i=0; i<numsectors; i++)
|
||||
{
|
||||
switch (mapversion)
|
||||
{
|
||||
case 5:
|
||||
fr.Read(&v5sect,sizeof(struct sectortypev5));
|
||||
v5sect.wallptr = B_LITTLE16(v5sect.wallptr);
|
||||
v5sect.wallnum = B_LITTLE16(v5sect.wallnum);
|
||||
v5sect.ceilingpicnum = B_LITTLE16(v5sect.ceilingpicnum);
|
||||
v5sect.floorpicnum = B_LITTLE16(v5sect.floorpicnum);
|
||||
v5sect.ceilingheinum = B_LITTLE16(v5sect.ceilingheinum);
|
||||
v5sect.floorheinum = B_LITTLE16(v5sect.floorheinum);
|
||||
v5sect.ceilingz = B_LITTLE32(v5sect.ceilingz);
|
||||
v5sect.floorz = B_LITTLE32(v5sect.floorz);
|
||||
v5sect.lotag = B_LITTLE16(v5sect.lotag);
|
||||
v5sect.hitag = B_LITTLE16(v5sect.hitag);
|
||||
v5sect.extra = B_LITTLE16(v5sect.extra);
|
||||
break;
|
||||
case 6:
|
||||
fr.Read(&v6sect,sizeof(struct sectortypev6));
|
||||
v6sect.wallptr = B_LITTLE16(v6sect.wallptr);
|
||||
v6sect.wallnum = B_LITTLE16(v6sect.wallnum);
|
||||
v6sect.ceilingpicnum = B_LITTLE16(v6sect.ceilingpicnum);
|
||||
v6sect.floorpicnum = B_LITTLE16(v6sect.floorpicnum);
|
||||
v6sect.ceilingheinum = B_LITTLE16(v6sect.ceilingheinum);
|
||||
v6sect.floorheinum = B_LITTLE16(v6sect.floorheinum);
|
||||
v6sect.ceilingz = B_LITTLE32(v6sect.ceilingz);
|
||||
v6sect.floorz = B_LITTLE32(v6sect.floorz);
|
||||
v6sect.lotag = B_LITTLE16(v6sect.lotag);
|
||||
v6sect.hitag = B_LITTLE16(v6sect.hitag);
|
||||
v6sect.extra = B_LITTLE16(v6sect.extra);
|
||||
break;
|
||||
}
|
||||
|
||||
switch (mapversion)
|
||||
{
|
||||
case 5:
|
||||
convertv5sectv6(&v5sect,&v6sect);
|
||||
fallthrough__;
|
||||
case 6:
|
||||
convertv6sectv7(&v6sect,§or[i]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
fr.Read(&numwalls,2); numwalls = B_LITTLE16(numwalls);
|
||||
if (numwalls > MAXWALLS) { return -1; }
|
||||
for (i=0; i<numwalls; i++)
|
||||
{
|
||||
switch (mapversion)
|
||||
{
|
||||
case 5:
|
||||
fr.Read(&v5wall,sizeof(struct walltypev5));
|
||||
v5wall.x = B_LITTLE32(v5wall.x);
|
||||
v5wall.y = B_LITTLE32(v5wall.y);
|
||||
v5wall.point2 = B_LITTLE16(v5wall.point2);
|
||||
v5wall.picnum = B_LITTLE16(v5wall.picnum);
|
||||
v5wall.overpicnum = B_LITTLE16(v5wall.overpicnum);
|
||||
v5wall.cstat = B_LITTLE16(v5wall.cstat);
|
||||
v5wall.nextsector1 = B_LITTLE16(v5wall.nextsector1);
|
||||
v5wall.nextwall1 = B_LITTLE16(v5wall.nextwall1);
|
||||
v5wall.nextsector2 = B_LITTLE16(v5wall.nextsector2);
|
||||
v5wall.nextwall2 = B_LITTLE16(v5wall.nextwall2);
|
||||
v5wall.lotag = B_LITTLE16(v5wall.lotag);
|
||||
v5wall.hitag = B_LITTLE16(v5wall.hitag);
|
||||
v5wall.extra = B_LITTLE16(v5wall.extra);
|
||||
break;
|
||||
case 6:
|
||||
fr.Read(&v6wall,sizeof(struct walltypev6));
|
||||
v6wall.x = B_LITTLE32(v6wall.x);
|
||||
v6wall.y = B_LITTLE32(v6wall.y);
|
||||
v6wall.point2 = B_LITTLE16(v6wall.point2);
|
||||
v6wall.nextsector = B_LITTLE16(v6wall.nextsector);
|
||||
v6wall.nextwall = B_LITTLE16(v6wall.nextwall);
|
||||
v6wall.picnum = B_LITTLE16(v6wall.picnum);
|
||||
v6wall.overpicnum = B_LITTLE16(v6wall.overpicnum);
|
||||
v6wall.cstat = B_LITTLE16(v6wall.cstat);
|
||||
v6wall.lotag = B_LITTLE16(v6wall.lotag);
|
||||
v6wall.hitag = B_LITTLE16(v6wall.hitag);
|
||||
v6wall.extra = B_LITTLE16(v6wall.extra);
|
||||
break;
|
||||
}
|
||||
|
||||
switch (mapversion)
|
||||
{
|
||||
case 5:
|
||||
convertv5wallv6(&v5wall,&v6wall,i);
|
||||
fallthrough__;
|
||||
case 6:
|
||||
convertv6wallv7(&v6wall,&wall[i]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
fr.Read(&numsprites,2); numsprites = B_LITTLE16(numsprites);
|
||||
if (numsprites > MAXSPRITES) { return -1; }
|
||||
for (i=0; i<numsprites; i++)
|
||||
{
|
||||
switch (mapversion)
|
||||
{
|
||||
case 5:
|
||||
fr.Read(&v5spr,sizeof(struct spritetypev5));
|
||||
v5spr.x = B_LITTLE32(v5spr.x);
|
||||
v5spr.y = B_LITTLE32(v5spr.y);
|
||||
v5spr.z = B_LITTLE32(v5spr.z);
|
||||
v5spr.picnum = B_LITTLE16(v5spr.picnum);
|
||||
v5spr.ang = B_LITTLE16(v5spr.ang);
|
||||
v5spr.xvel = B_LITTLE16(v5spr.xvel);
|
||||
v5spr.yvel = B_LITTLE16(v5spr.yvel);
|
||||
v5spr.zvel = B_LITTLE16(v5spr.zvel);
|
||||
v5spr.owner = B_LITTLE16(v5spr.owner);
|
||||
v5spr.sectnum = B_LITTLE16(v5spr.sectnum);
|
||||
v5spr.statnum = B_LITTLE16(v5spr.statnum);
|
||||
v5spr.lotag = B_LITTLE16(v5spr.lotag);
|
||||
v5spr.hitag = B_LITTLE16(v5spr.hitag);
|
||||
v5spr.extra = B_LITTLE16(v5spr.extra);
|
||||
break;
|
||||
case 6:
|
||||
fr.Read(&v6spr,sizeof(struct spritetypev6));
|
||||
v6spr.x = B_LITTLE32(v6spr.x);
|
||||
v6spr.y = B_LITTLE32(v6spr.y);
|
||||
v6spr.z = B_LITTLE32(v6spr.z);
|
||||
v6spr.cstat = B_LITTLE16(v6spr.cstat);
|
||||
v6spr.picnum = B_LITTLE16(v6spr.picnum);
|
||||
v6spr.ang = B_LITTLE16(v6spr.ang);
|
||||
v6spr.xvel = B_LITTLE16(v6spr.xvel);
|
||||
v6spr.yvel = B_LITTLE16(v6spr.yvel);
|
||||
v6spr.zvel = B_LITTLE16(v6spr.zvel);
|
||||
v6spr.owner = B_LITTLE16(v6spr.owner);
|
||||
v6spr.sectnum = B_LITTLE16(v6spr.sectnum);
|
||||
v6spr.statnum = B_LITTLE16(v6spr.statnum);
|
||||
v6spr.lotag = B_LITTLE16(v6spr.lotag);
|
||||
v6spr.hitag = B_LITTLE16(v6spr.hitag);
|
||||
v6spr.extra = B_LITTLE16(v6spr.extra);
|
||||
break;
|
||||
}
|
||||
|
||||
switch (mapversion)
|
||||
{
|
||||
case 5:
|
||||
convertv5sprv6(&v5spr,&v6spr);
|
||||
fallthrough__;
|
||||
case 6:
|
||||
convertv6sprv7(&v6spr,&sprite[i]);
|
||||
break;
|
||||
}
|
||||
|
||||
check_sprite(i);
|
||||
}
|
||||
|
||||
// Done reading file.
|
||||
|
||||
g_loadedMapVersion = mapversion;
|
||||
|
||||
return engineFinishLoadBoard(filename, dapos, dacursectnum, numsprites, 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//
|
||||
// setgamemode
|
||||
//
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue