Skip to content

Y
ygopro
Commit 8c995372 authored by nanahira's avatar nanahira
Browse files
Options

rename

parent 348ecc21
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
gframe/single_duel.cpp
View file @ 8c995372
......@@ -578,11 +578,11 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
last_replay.WriteHeader(rh);
last_replay.WriteData(players[0]->name, 40, false);
last_replay.WriteData(players[1]->name, 40, false);
Deck duplicatedDeck[2];
deckManager.MutateDecks(pdeck, duplicatedDeck, 2);
Deck mutatedDeck[2];
deckManager.MutateDecks(pdeck, mutatedDeck, 2);
if(!host_info.no_shuffle_deck) {
rnd.shuffle_vector(duplicatedDeck[0].main);
rnd.shuffle_vector(duplicatedDeck[1].main);
rnd.shuffle_vector(mutatedDeck[0].main);
rnd.shuffle_vector(mutatedDeck[1].main);
}
time_limit[0] = host_info.time_limit;
time_limit[1] = host_info.time_limit;
......@@ -613,23 +613,23 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
std::vector<ygo::code_pointer> extra_cards;
auto load_extra = [&](uint8_t p) {
extra_cards.clear();
for(auto cit : duplicatedDeck[p].extra)
for(auto cit : mutatedDeck[p].extra)
extra_cards.push_back(cit);
if(duel_flags & DUEL_FLAG_SIDEINS)
for(auto cit : duplicatedDeck[p].side)
for(auto cit : mutatedDeck[p].side)
if(cit->second.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK))
extra_cards.push_back(cit);
return extra_cards;
};
load(duplicatedDeck[0].main, 0, LOCATION_DECK);
load(mutatedDeck[0].main, 0, LOCATION_DECK);
load(load_extra(0), 0, LOCATION_EXTRA);
load(duplicatedDeck[1].main, 1, LOCATION_DECK);
load(mutatedDeck[1].main, 1, LOCATION_DECK);
load(load_extra(1), 1, LOCATION_EXTRA);
#else
load(duplicatedDeck[0].main, 0, LOCATION_DECK);
load(duplicatedDeck[0].extra, 0, LOCATION_EXTRA);
load(duplicatedDeck[1].main, 1, LOCATION_DECK);
load(duplicatedDeck[1].extra, 1, LOCATION_EXTRA);
load(mutatedDeck[0].main, 0, LOCATION_DECK);
load(mutatedDeck[0].extra, 0, LOCATION_EXTRA);
load(mutatedDeck[1].main, 1, LOCATION_DECK);
load(mutatedDeck[1].extra, 1, LOCATION_EXTRA);
#endif
last_replay.Flush();
unsigned char startbuf[32]{};
......
gframe/tag_duel.cpp
View file @ 8c995372
......@@ -557,13 +557,13 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
last_replay.WriteData(players[1]->name, 40, false);
last_replay.WriteData(players[2]->name, 40, false);
last_replay.WriteData(players[3]->name, 40, false);
Deck duplicatedDeck[4];
deckManager.MutateDecks(pdeck, duplicatedDeck, 4);
Deck mutatedDeck[4];
deckManager.MutateDecks(pdeck, mutatedDeck, 4);
if(!host_info.no_shuffle_deck) {
rnd.shuffle_vector(duplicatedDeck[0].main);
rnd.shuffle_vector(duplicatedDeck[1].main);
rnd.shuffle_vector(duplicatedDeck[2].main);
rnd.shuffle_vector(duplicatedDeck[3].main);
rnd.shuffle_vector(mutatedDeck[0].main);
rnd.shuffle_vector(mutatedDeck[1].main);
rnd.shuffle_vector(mutatedDeck[2].main);
rnd.shuffle_vector(mutatedDeck[3].main);
}
time_limit[0] = host_info.time_limit;
time_limit[1] = host_info.time_limit;
......@@ -602,31 +602,31 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
std::vector<ygo::code_pointer> extra_cards;
auto load_extra = [&](uint8_t p) {
extra_cards.clear();
for(auto cit : duplicatedDeck[p].extra)
for(auto cit : mutatedDeck[p].extra)
extra_cards.push_back(cit);
if(duel_flags & DUEL_FLAG_SIDEINS)
for(auto cit : duplicatedDeck[p].side)
for(auto cit : mutatedDeck[p].side)
if(cit->second.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK))
extra_cards.push_back(cit);
return extra_cards;
};
load_single(duplicatedDeck[0].main, 0, LOCATION_DECK);
load_single(mutatedDeck[0].main, 0, LOCATION_DECK);
load_single(load_extra(0), 0, LOCATION_EXTRA);
load_tag(duplicatedDeck[1].main, 0, LOCATION_DECK);
load_tag(mutatedDeck[1].main, 0, LOCATION_DECK);
load_tag(load_extra(1), 0, LOCATION_EXTRA);
load_single(duplicatedDeck[3].main, 1, LOCATION_DECK);
load_single(mutatedDeck[3].main, 1, LOCATION_DECK);
load_single(load_extra(3), 1, LOCATION_EXTRA);
load_tag(duplicatedDeck[2].main, 1, LOCATION_DECK);
load_tag(mutatedDeck[2].main, 1, LOCATION_DECK);
load_tag(load_extra(2), 1, LOCATION_EXTRA);
#else
load_single(duplicatedDeck[0].main, 0, LOCATION_DECK);
load_single(duplicatedDeck[0].extra, 0, LOCATION_EXTRA);
load_tag(duplicatedDeck[1].main, 0, LOCATION_DECK);
load_tag(duplicatedDeck[1].extra, 0, LOCATION_EXTRA);
load_single(duplicatedDeck[3].main, 1, LOCATION_DECK);
load_single(duplicatedDeck[3].extra, 1, LOCATION_EXTRA);
load_tag(duplicatedDeck[2].main, 1, LOCATION_DECK);
load_tag(duplicatedDeck[2].extra, 1, LOCATION_EXTRA);
load_single(mutatedDeck[0].main, 0, LOCATION_DECK);
load_single(mutatedDeck[0].extra, 0, LOCATION_EXTRA);
load_tag(mutatedDeck[1].main, 0, LOCATION_DECK);
load_tag(mutatedDeck[1].extra, 0, LOCATION_EXTRA);
load_single(mutatedDeck[3].main, 1, LOCATION_DECK);
load_single(mutatedDeck[3].extra, 1, LOCATION_EXTRA);
load_tag(mutatedDeck[2].main, 1, LOCATION_DECK);
load_tag(mutatedDeck[2].extra, 1, LOCATION_EXTRA);
#endif
last_replay.Flush();
unsigned char startbuf[32]{};
......
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