rename

gframe/client_field.cpp

@@ -124,37 +124,23 @@ void ClientField::Clear() {
 	RefreshCardCountDisplay();
 }
 void ClientField::Initial(int player, int deckc, int extrac, int sidec) {
-	ClientCard* pcard;
-	for(int i = 0; i < deckc; ++i) {
-		pcard = new ClientCard;
-		deck[player].push_back(pcard);
-		pcard->owner = player;
-		pcard->controler = player;
-		pcard->location = LOCATION_DECK;
-		pcard->sequence = i;
-		pcard->position = POS_FACEDOWN_DEFENSE;
-		GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
-	}
-	for(int i = 0; i < extrac; ++i) {
-		pcard = new ClientCard;
-		extra[player].push_back(pcard);
-		pcard->owner = player;
-		pcard->controler = player;
-		pcard->location = LOCATION_EXTRA;
-		pcard->sequence = i;
-		pcard->position = POS_FACEDOWN_DEFENSE;
-		GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
-	}
-	for(int i = 0; i < sidec; ++i) {
-		pcard = new ClientCard;
-		remove[player].push_back(pcard);
+	auto load_location = [&](std::vector<ClientCard*>& container, int count, uint8_t location) {
+		for(int i = 0; i < count; ++i) {
+			ClientCard* pcard = new ClientCard;
+			container.push_back(pcard);
 			pcard->owner = player;
 			pcard->controler = player;
-		pcard->location = LOCATION_REMOVED;
+			pcard->location = location;
 			pcard->sequence = i;
 			pcard->position = POS_FACEDOWN_DEFENSE;
 			GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
 		}
+	};
+
+	load_location(deck[player], deckc, LOCATION_DECK);
+	load_location(extra[player], extrac, LOCATION_EXTRA);
+	load_location(remove[player], sidec, LOCATION_REMOVED);
+
 	RefreshCardCountDisplay();
 }
 void ClientField::ResetSequence(std::vector<ClientCard*>& list, bool reset_height) {