Simplify d1_matcen_info_read
This commit is contained in:
parent
92814475a9
commit
952fc31449
|
@ -179,7 +179,7 @@ void fuelcen_check_for_hoard_goal(segment *segp);
|
||||||
/*
|
/*
|
||||||
* reads an d1_matcen_info structure from a PHYSFS_file
|
* reads an d1_matcen_info structure from a PHYSFS_file
|
||||||
*/
|
*/
|
||||||
void d1_matcen_info_read(d1_matcen_info *mi, PHYSFS_file *fp);
|
void d1_matcen_info_read(matcen_info *mi, PHYSFS_file *fp);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -777,9 +777,10 @@ void fuelcen_check_for_hoard_goal(segment *segp)
|
||||||
/*
|
/*
|
||||||
* reads an d1_matcen_info structure from a PHYSFS_file
|
* reads an d1_matcen_info structure from a PHYSFS_file
|
||||||
*/
|
*/
|
||||||
void d1_matcen_info_read(d1_matcen_info *mi, PHYSFS_file *fp)
|
void d1_matcen_info_read(matcen_info *mi, PHYSFS_file *fp)
|
||||||
{
|
{
|
||||||
mi->robot_flags[0] = PHYSFSX_readInt(fp);
|
mi->robot_flags[0] = PHYSFSX_readInt(fp);
|
||||||
|
mi->robot_flags[1] = 0;
|
||||||
mi->hit_points = PHYSFSX_readFix(fp);
|
mi->hit_points = PHYSFSX_readFix(fp);
|
||||||
mi->interval = PHYSFSX_readFix(fp);
|
mi->interval = PHYSFSX_readFix(fp);
|
||||||
mi->segnum = PHYSFSX_readShort(fp);
|
mi->segnum = PHYSFSX_readShort(fp);
|
||||||
|
|
|
@ -1062,14 +1062,7 @@ static int load_game_data(PHYSFS_file *LoadFile)
|
||||||
matcen_info_read(&RobotCenters[i], LoadFile, game_top_fileinfo_version);
|
matcen_info_read(&RobotCenters[i], LoadFile, game_top_fileinfo_version);
|
||||||
#elif defined(DXX_BUILD_DESCENT_II)
|
#elif defined(DXX_BUILD_DESCENT_II)
|
||||||
if (game_top_fileinfo_version < 27) {
|
if (game_top_fileinfo_version < 27) {
|
||||||
d1_matcen_info m;
|
d1_matcen_info_read(&RobotCenters[i], LoadFile);
|
||||||
d1_matcen_info_read(&m, LoadFile);
|
|
||||||
RobotCenters[i].robot_flags[0] = m.robot_flags[0];
|
|
||||||
RobotCenters[i].robot_flags[1] = 0;
|
|
||||||
RobotCenters[i].hit_points = m.hit_points;
|
|
||||||
RobotCenters[i].interval = m.interval;
|
|
||||||
RobotCenters[i].segnum = m.segnum;
|
|
||||||
RobotCenters[i].fuelcen_num = m.fuelcen_num;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
matcen_info_read(&RobotCenters[i], LoadFile, 0);
|
matcen_info_read(&RobotCenters[i], LoadFile, 0);
|
||||||
|
|
Loading…
Reference in a new issue