From ab9c0681d29956b2919640abc0d1225308d4da67 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 30 Mar 2013 02:01:36 +0000 Subject: [PATCH] Read robot_info arrays in pieces --- main/robot.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/main/robot.c b/main/robot.c index 6cff6e357..701cdb96a 100644 --- a/main/robot.c +++ b/main/robot.c @@ -238,7 +238,8 @@ int robot_info_read_n(robot_info *ri, int n, PHYSFS_file *fp) ri[i].model_num = PHYSFSX_readInt(fp); for (j = 0; j < MAX_GUNS; j++) PHYSFSX_readVector(&(ri[i].gun_points[j]), fp); - PHYSFS_read(fp, ri[i].gun_submodels, MAX_GUNS, 1); + for (j = 0; j < sizeof(ri[i].gun_submodels) / sizeof(ri[i].gun_submodels[0]); j++) + ri[i].gun_submodels[j] = PHYSFSX_readByte(fp); ri[i].exp1_vclip_num = PHYSFSX_readShort(fp); ri[i].exp1_sound_num = PHYSFSX_readShort(fp); @@ -278,9 +279,10 @@ int robot_info_read_n(robot_info *ri, int n, PHYSFS_file *fp) ri[i].max_speed[j] = PHYSFSX_readFix(fp); for (j = 0; j < NDL; j++) ri[i].circle_distance[j] = PHYSFSX_readFix(fp); - PHYSFS_read(fp, ri[i].rapidfire_count, NDL, 1); - - PHYSFS_read(fp, ri[i].evade_speed, NDL, 1); + for (j = 0; j < NDL; j++) + ri[i].rapidfire_count[j] = PHYSFSX_readByte(fp); + for (j = 0; j < NDL; j++) + ri[i].evade_speed[j] = PHYSFSX_readByte(fp); ri[i].cloak_type = PHYSFSX_readByte(fp); ri[i].attack_type = PHYSFSX_readByte(fp);