Skip to content

Y
ygopro
Commit 4e9d5fa8 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:Fluorohydride/ygopro

parents 2ddd90f0 032b1f73
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 33 deletions
gframe/drawing.cpp
View file @ 4e9d5fa8
...@@ -496,7 +496,6 @@ void Game::DrawMisc() { ...@@ -496,7 +496,6 @@ void Game::DrawMisc() {
driver->setTransform(irr::video::ETS_WORLD, im); driver->setTransform(irr::video::ETS_WORLD, im);
driver->drawVertexPrimitiveList(matManager.vActivate, 4, matManager.iRectangle, 2); driver->drawVertexPrimitiveList(matManager.vActivate, 4, matManager.iRectangle, 2);
} }
if(dField.chains.size() > 1) {
for(size_t i = 0; i < dField.chains.size(); ++i) { for(size_t i = 0; i < dField.chains.size(); ++i) {
if(dField.chains[i].solved) if(dField.chains[i].solved)
break; break;
...@@ -518,7 +517,6 @@ void Game::DrawMisc() { ...@@ -518,7 +517,6 @@ void Game::DrawMisc() {
driver->setTransform(irr::video::ETS_WORLD, it); driver->setTransform(irr::video::ETS_WORLD, it);
driver->drawVertexPrimitiveList(matManager.vChainNum, 4, matManager.iRectangle, 2); driver->drawVertexPrimitiveList(matManager.vChainNum, 4, matManager.iRectangle, 2);
} }
}
//finish button //finish button
if(btnCancelOrFinish->isVisible() && dField.select_ready) if(btnCancelOrFinish->isVisible() && dField.select_ready)
DrawSelectionLine(btnCancelOrFinish, 2, 0xffffff00); DrawSelectionLine(btnCancelOrFinish, 2, 0xffffff00);
......
gframe/duelclient.cpp
View file @ 4e9d5fa8
...@@ -3143,8 +3143,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -3143,8 +3143,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->WaitFrameSignal(11); mainGame->WaitFrameSignal(11);
} }
} }
if (mainGame->dField.chains.size() > 1) { if(mainGame->dField.last_chain)
if (mainGame->dField.last_chain)
mainGame->WaitFrameSignal(11); mainGame->WaitFrameSignal(11);
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 5; ++i) {
mainGame->dField.chains[ct - 1].solved = false; mainGame->dField.chains[ct - 1].solved = false;
...@@ -3152,7 +3151,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -3152,7 +3151,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->dField.chains[ct - 1].solved = true; mainGame->dField.chains[ct - 1].solved = true;
mainGame->WaitFrameSignal(3); mainGame->WaitFrameSignal(3);
} }
}
mainGame->dField.last_chain = false; mainGame->dField.last_chain = false;
return true; return true;
} }
......
ocgcore @ a78b48f3
Subproject commit d8ee620789d02a1a540f5bd788971268870a72ab Subproject commit a78b48f3303ba13ee03549117fe996dc32831aaa
script @ 8249a716
Subproject commit 216c4754fb203fe2f598fee02ace05e54f7cea55 Subproject commit 8249a716f8128b10f332634bb73cf01d7c67a8fc
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