clang

Author: Goober5000

code/missioneditor/common.cpp

@@ -228,14 +228,14 @@ void reassign_ship_slot(int from, int to, const FredShipSlotConfig& cfg)
 	// Wing membership: scan every wing and re-point any reference to the old slot.
 	// (wing.special_ship is wing-relative, NOT a Ships[] index, so it is intentionally
 	// not touched here.)
-	for (int w = 0; w < MAX_WINGS; ++w)
+	for (auto &w: Wings)
 	{
-		if (Wings[w].wave_count == 0)
+		if (w.wave_count == 0)
 			continue;
-		for (int k = 0; k < Wings[w].wave_count; ++k)
+		for (int k = 0; k < w.wave_count; ++k)
 		{
-			if (Wings[w].ship_index[k] == from)
-				Wings[w].ship_index[k] = to;
+			if (w.ship_index[k] == from)
+				w.ship_index[k] = to;
 		}
 	}
 
@@ -306,12 +306,12 @@ void reassign_wing_slot(int from, int to, const FredWingSlotConfig& cfg)
 	}
 
 	// Per-ship parent-wing back-reference.
-	for (int i = 0; i < MAX_SHIPS; ++i)
+	for (auto &s: Ships)
 	{
-		if (Ships[i].objnum < 0)
+		if (s.objnum < 0)
 			continue;
-		if (Ships[i].wingnum == from)
-			Ships[i].wingnum = to;
+		if (s.wingnum == from)
+			s.wingnum = to;
 	}
 
 	// FRED's current-wing pointer, if the caller is tracking one.