From 952fc31449a8d14a113ad1a5d742b63dcab38336 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 2 Feb 2014 04:14:16 +0000 Subject: [PATCH] Simplify d1_matcen_info_read --- common/main/fuelcen.h | 2 +- similar/main/fuelcen.cpp | 3 ++- similar/main/gamesave.cpp | 9 +-------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/common/main/fuelcen.h b/common/main/fuelcen.h index 9f82cd522..f220f6f6c 100644 --- a/common/main/fuelcen.h +++ b/common/main/fuelcen.h @@ -179,7 +179,7 @@ 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); +void d1_matcen_info_read(matcen_info *mi, PHYSFS_file *fp); #endif /* diff --git a/similar/main/fuelcen.cpp b/similar/main/fuelcen.cpp index 7594b1532..c19dd6d14 100644 --- a/similar/main/fuelcen.cpp +++ b/similar/main/fuelcen.cpp @@ -777,9 +777,10 @@ 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) +void d1_matcen_info_read(matcen_info *mi, PHYSFS_file *fp) { mi->robot_flags[0] = PHYSFSX_readInt(fp); + mi->robot_flags[1] = 0; mi->hit_points = PHYSFSX_readFix(fp); mi->interval = PHYSFSX_readFix(fp); mi->segnum = PHYSFSX_readShort(fp); diff --git a/similar/main/gamesave.cpp b/similar/main/gamesave.cpp index 4a9315b4a..82d3e1a4b 100644 --- a/similar/main/gamesave.cpp +++ b/similar/main/gamesave.cpp @@ -1062,14 +1062,7 @@ static int load_game_data(PHYSFS_file *LoadFile) matcen_info_read(&RobotCenters[i], LoadFile, game_top_fileinfo_version); #elif defined(DXX_BUILD_DESCENT_II) if (game_top_fileinfo_version < 27) { - d1_matcen_info m; - 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; + d1_matcen_info_read(&RobotCenters[i], LoadFile); } else matcen_info_read(&RobotCenters[i], LoadFile, 0);