Skip to content

Y
ygopro-2pick
Commit 8421bede authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents c2dfb6c9 a503a72b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
.gitignore
View file @ 8421bede
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
/.vscode /.vscode
/bak/ /bak/
/output /output
/replace.sh
/temp /temp
[Tt]humbs.cdb [Tt]humbs.cdb
......
cards.cdb
View file @ 8421bede
No preview for this file type
gframe/client_field.cpp
View file @ 8421bede
...@@ -662,6 +662,7 @@ void ClientField::ReplaySwap() { ...@@ -662,6 +662,7 @@ void ClientField::ReplaySwap() {
std::swap(mainGame->dInfo.start_lp[0], mainGame->dInfo.start_lp[1]); std::swap(mainGame->dInfo.start_lp[0], mainGame->dInfo.start_lp[1]);
std::swap(mainGame->dInfo.hostname, mainGame->dInfo.clientname); std::swap(mainGame->dInfo.hostname, mainGame->dInfo.clientname);
std::swap(mainGame->dInfo.hostname_tag, mainGame->dInfo.clientname_tag); std::swap(mainGame->dInfo.hostname_tag, mainGame->dInfo.clientname_tag);
RefreshCardCountDisplay();
for(auto chit = chains.begin(); chit != chains.end(); ++chit) { for(auto chit = chains.begin(); chit != chains.end(); ++chit) {
chit->controler = 1 - chit->controler; chit->controler = 1 - chit->controler;
GetChainLocation(chit->controler, chit->location, chit->sequence, &chit->chain_pos); GetChainLocation(chit->controler, chit->location, chit->sequence, &chit->chain_pos);
......
script @ 77fcba93
Subproject commit 77b486a913a2552af9e74ec69189b66930bfbaac Subproject commit 77fcba93ca1be1aff287eace401caa6cef231740
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