Add dummy parameter version to D2 matcen_info_read
This commit is contained in:
parent
0257b9ca1c
commit
ebfb559fe1
|
@ -168,23 +168,17 @@ extern void init_all_matcens(void);
|
|||
extern const fix EnergyToCreateOneRobot;
|
||||
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
#if defined(DXX_BUILD_DESCENT_I)
|
||||
/*
|
||||
* reads a matcen_info structure from a PHYSFS_file
|
||||
*/
|
||||
void matcen_info_read(matcen_info *ps, PHYSFS_file *fp, int version);
|
||||
#elif defined(DXX_BUILD_DESCENT_II)
|
||||
#if defined(DXX_BUILD_DESCENT_II)
|
||||
void fuelcen_check_for_hoard_goal(segment *segp);
|
||||
|
||||
/*
|
||||
* reads an d1_matcen_info structure from a PHYSFS_file
|
||||
*/
|
||||
void d1_matcen_info_read(d1_matcen_info *mi, PHYSFS_file *fp);
|
||||
|
||||
/*
|
||||
* reads a matcen_info structure from a PHYSFS_file
|
||||
*/
|
||||
void matcen_info_read(matcen_info *ps, PHYSFS_file *fp);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
@ -788,17 +788,14 @@ void d1_matcen_info_read(d1_matcen_info *mi, PHYSFS_file *fp)
|
|||
/*
|
||||
* reads a matcen_info structure from a PHYSFS_file
|
||||
*/
|
||||
#if defined(DXX_BUILD_DESCENT_I)
|
||||
void matcen_info_read(matcen_info *mi, PHYSFS_file *fp, int version)
|
||||
#elif defined(DXX_BUILD_DESCENT_II)
|
||||
void matcen_info_read(matcen_info *mi, PHYSFS_file *fp)
|
||||
#endif
|
||||
{
|
||||
mi->robot_flags[0] = PHYSFSX_readInt(fp);
|
||||
#if defined(DXX_BUILD_DESCENT_I)
|
||||
if (version > 25)
|
||||
/*mi->robot_flags2 =*/ PHYSFSX_readInt(fp);
|
||||
#elif defined(DXX_BUILD_DESCENT_II)
|
||||
(void)version;
|
||||
mi->robot_flags[1] = PHYSFSX_readInt(fp);
|
||||
#endif
|
||||
mi->hit_points = PHYSFSX_readFix(fp);
|
||||
|
|
|
@ -1078,7 +1078,7 @@ static int load_game_data(PHYSFS_file *LoadFile)
|
|||
RobotCenters[i].fuelcen_num = m.fuelcen_num;
|
||||
}
|
||||
else
|
||||
matcen_info_read(&RobotCenters[i], LoadFile);
|
||||
matcen_info_read(&RobotCenters[i], LoadFile, 0);
|
||||
#endif
|
||||
// Set links in RobotCenters to Station array
|
||||
range_for (segment &seg, partial_range(Segments, Highest_segment_index + 1))
|
||||
|
|
Loading…
Reference in a new issue