TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove v16_segment definition

Browse source 
Support for v16_segment was declared broken in 6d0d68d188.  No one
objected.  Remove the definition to simplify future work.
This commit is contained in:
Kp 2018-12-13 02:31:38 +00:00
parent 706a704c6d
commit a54c323e45
1 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
similar/main/gamemine.cpp
View file

@ -82,32 +82,11 @@ static void segment2_read(shared_segment &s2, unique_segment &u2, PHYSFS_File *f
}
#if defined(DXX_BUILD_DESCENT_I)
typedef segment v16_segment;
#elif defined(DXX_BUILD_DESCENT_II)
fix Level_shake_frequency = 0, Level_shake_duration = 0;
segnum_t Secret_return_segment;
vms_matrix Secret_return_orient;
struct v16_segment {
#if DXX_USE_EDITOR
short segnum; // segment number, not sure what it means
#endif
side sides[MAX_SIDES_PER_SEGMENT]; // 6 sides
short children[MAX_SIDES_PER_SEGMENT]; // indices of 6 children segments, front, left, top, right, bottom, back
short verts[MAX_VERTICES_PER_SEGMENT]; // vertex ids of 4 front and 4 back vertices
#ifdef EDITOR
short group; // group number to which the segment belongs.
#endif
short objects; // pointer to objects in this segment
ubyte special; // what type of center this is
sbyte matcen_num; // which center segment is associated with.
short value;
fix static_light; // average static light in segment
#if !DXX_USE_EDITOR
short pad; // make structure longword aligned
#endif
};
int d1_pig_present = 0; // can descent.pig from descent 1 be loaded?
/* returns nonzero if d1_tmap_num references a texture which isn't available in d2. */
@ -667,15 +646,15 @@ int load_mine_data(PHYSFS_File *LoadFile)
#endif
if (mine_top_fileinfo.fileinfo_version >= 16)
{
Error("Sorry, v16 segment support is broken.");
#if 0
v16_segment v16_seg;
Assert(mine_fileinfo.segment_sizeof == sizeof(v16_seg));
Error("Sorry, v16 segment support is broken.");
#if defined(DXX_BUILD_DESCENT_I)
*i = v16_seg;
#elif defined(DXX_BUILD_DESCENT_II)
#if 0
i->segnum = v16_seg.segnum;
// -- Segments[i].pad = v16_seg.pad;