From 1e84c245e19c6835696f3454fde9c210ebb8b4be Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 12 Jul 2014 04:02:04 +0000 Subject: [PATCH] Use range_for for multi_strip_robots --- similar/main/multibot.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/similar/main/multibot.cpp b/similar/main/multibot.cpp index f841aa244..71a1ae4b5 100644 --- a/similar/main/multibot.cpp +++ b/similar/main/multibot.cpp @@ -55,6 +55,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "escort.h" #endif +#include "compiler-range_for.h" + static int multi_add_controlled_robot(int objnum, int agitation); static void multi_send_release_robot(int objnum); static void multi_delete_controlled_robot(int objnum); @@ -201,8 +203,10 @@ multi_strip_robots(int playernum) if (Game_mode & GM_MULTI_ROBOTS) { if (playernum == Player_num) - for (i = 0; i < MAX_ROBOTS_CONTROLLED; i++) - multi_delete_controlled_robot(robot_controlled[i]); + { + range_for (auto r, robot_controlled) + multi_delete_controlled_robot(r); + } for (i = 1; i <= Highest_object_index; i++) if ((Objects[i].type == OBJ_ROBOT) && (Objects[i].ctype.ai_info.REMOTE_OWNER == playernum)) {