Commit 43fba0c7 authored by nanahira's avatar nanahira

rename

parent ae417f57
Pipeline #36409 failed with stages
in 2 minutes and 29 seconds
...@@ -124,37 +124,23 @@ void ClientField::Clear() { ...@@ -124,37 +124,23 @@ void ClientField::Clear() {
RefreshCardCountDisplay(); RefreshCardCountDisplay();
} }
void ClientField::Initial(int player, int deckc, int extrac, int sidec) { void ClientField::Initial(int player, int deckc, int extrac, int sidec) {
ClientCard* pcard; auto load_location = [&](std::vector<ClientCard*>& container, int count, uint8_t location) {
for(int i = 0; i < deckc; ++i) { for(int i = 0; i < count; ++i) {
pcard = new ClientCard; ClientCard* pcard = new ClientCard;
deck[player].push_back(pcard); container.push_back(pcard);
pcard->owner = player; pcard->owner = player;
pcard->controler = player; pcard->controler = player;
pcard->location = LOCATION_DECK; pcard->location = location;
pcard->sequence = i; pcard->sequence = i;
pcard->position = POS_FACEDOWN_DEFENSE; pcard->position = POS_FACEDOWN_DEFENSE;
GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true); GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
} }
for(int i = 0; i < extrac; ++i) { };
pcard = new ClientCard;
extra[player].push_back(pcard); load_location(deck[player], deckc, LOCATION_DECK);
pcard->owner = player; load_location(extra[player], extrac, LOCATION_EXTRA);
pcard->controler = player; load_location(remove[player], sidec, LOCATION_REMOVED);
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);
pcard->owner = player;
pcard->controler = player;
pcard->location = LOCATION_REMOVED;
pcard->sequence = i;
pcard->position = POS_FACEDOWN_DEFENSE;
GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
}
RefreshCardCountDisplay(); RefreshCardCountDisplay();
} }
void ClientField::ResetSequence(std::vector<ClientCard*>& list, bool reset_height) { void ClientField::ResetSequence(std::vector<ClientCard*>& list, bool reset_height) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment