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

Pass shared_segment for some segment I/O

Browse source
This commit is contained in:
Kp 2018-06-24 05:06:15 +00:00
parent 2de3a1dd06
commit 98e6b36145
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
similar/editor/mine.cpp
View file

@ -534,13 +534,13 @@ static void write_verts(const vcsegptr_t seg, PHYSFS_File *SaveFile)
PHYSFS_writeSLE16(SaveFile, i);
}
static void write_special(const vcsegptr_t seg, ubyte bit_mask, PHYSFS_File *SaveFile)
static void write_special(const shared_segment &seg, const unsigned bit_mask, PHYSFS_File *const SaveFile)
{
if (bit_mask & (1 << MAX_SIDES_PER_SEGMENT))
{
PHYSFSX_writeU8(SaveFile, seg->special);
PHYSFSX_writeU8(SaveFile, seg->matcen_num);
PHYSFS_writeULE16(SaveFile, seg->station_idx);
PHYSFSX_writeU8(SaveFile, seg.special);
PHYSFSX_writeU8(SaveFile, seg.matcen_num);
PHYSFS_writeULE16(SaveFile, seg.station_idx);
}
}
// -----------------------------------------------------------------------------

24
similar/main/gamemine.cpp
View file

@ -836,36 +836,36 @@ int load_mine_data(PHYSFS_File *LoadFile)
#define COMPILED_MINE_VERSION 0
static void read_children(const vmsegptr_t segp,ubyte bit_mask,PHYSFS_File *LoadFile)
static void read_children(shared_segment &segp, const unsigned bit_mask, PHYSFS_File *const LoadFile)
{
for (int bit=0; bit<MAX_SIDES_PER_SEGMENT; bit++) {
if (bit_mask & (1 << bit)) {
segp->children[bit] = PHYSFSX_readShort(LoadFile);
segp.children[bit] = PHYSFSX_readShort(LoadFile);
} else
segp->children[bit] = segment_none;
segp.children[bit] = segment_none;
}
}
static void read_verts(const vmsegptr_t segp,PHYSFS_File *LoadFile)
static void read_verts(shared_segment &segp, PHYSFS_File *const LoadFile)
{
// Read short Segments[segnum].verts[MAX_VERTICES_PER_SEGMENT]
range_for (auto &i, segp->verts)
range_for (auto &i, segp.verts)
i = PHYSFSX_readShort(LoadFile);
}
static void read_special(const vmsegptr_t segp,ubyte bit_mask,PHYSFS_File *LoadFile)
static void read_special(shared_segment &segp, const unsigned bit_mask, PHYSFS_File *const LoadFile)
{
if (bit_mask & (1 << MAX_SIDES_PER_SEGMENT)) {
// Read ubyte Segments[segnum].special
segp->special = PHYSFSX_readByte(LoadFile);
segp.special = PHYSFSX_readByte(LoadFile);
// Read byte Segments[segnum].matcen_num
segp->matcen_num = PHYSFSX_readByte(LoadFile);
segp.matcen_num = PHYSFSX_readByte(LoadFile);
// Read short Segments[segnum].value
segp->station_idx = PHYSFSX_readShort(LoadFile);
segp.station_idx = PHYSFSX_readShort(LoadFile);
} else {
segp->special = 0;
segp->matcen_num = -1;
segp->station_idx = station_none;
segp.special = 0;
segp.matcen_num = -1;
segp.station_idx = station_none;
}
}