Skip to content

Y
ygopro
Commit be988d54 authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

Revert "always show chain mark (#2294)" (#2301)

parent 5009c68e
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 27 deletions
gframe/drawing.cpp
View file @ be988d54
...@@ -457,26 +457,28 @@ void Game::DrawMisc() { ...@@ -457,26 +457,28 @@ 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);
} }
for(size_t i = 0; i < dField.chains.size(); ++i) { if(dField.chains.size() > 1) {
if(dField.chains[i].solved) for(size_t i = 0; i < dField.chains.size(); ++i) {
break; if(dField.chains[i].solved)
matManager.mTRTexture.setTexture(0, imageManager.tChain); break;
matManager.mTRTexture.AmbientColor = 0xffffff00; matManager.mTRTexture.setTexture(0, imageManager.tChain);
ic.setRotationRadians(act_rot); matManager.mTRTexture.AmbientColor = 0xffffff00;
ic.setTranslation(dField.chains[i].chain_pos); ic.setRotationRadians(act_rot);
driver->setMaterial(matManager.mTRTexture); ic.setTranslation(dField.chains[i].chain_pos);
driver->setTransform(irr::video::ETS_WORLD, ic); driver->setMaterial(matManager.mTRTexture);
driver->drawVertexPrimitiveList(matManager.vSymbol, 4, matManager.iRectangle, 2); driver->setTransform(irr::video::ETS_WORLD, ic);
it.setScale(0.6f); driver->drawVertexPrimitiveList(matManager.vSymbol, 4, matManager.iRectangle, 2);
it.setTranslation(dField.chains[i].chain_pos); it.setScale(0.6f);
matManager.mTRTexture.setTexture(0, imageManager.tNumber); it.setTranslation(dField.chains[i].chain_pos);
matManager.vChainNum[0].TCoords = vector2df(0.19375f * (i % 5), 0.2421875f * (i / 5)); matManager.mTRTexture.setTexture(0, imageManager.tNumber);
matManager.vChainNum[1].TCoords = vector2df(0.19375f * (i % 5 + 1), 0.2421875f * (i / 5)); matManager.vChainNum[0].TCoords = vector2df(0.19375f * (i % 5), 0.2421875f * (i / 5));
matManager.vChainNum[2].TCoords = vector2df(0.19375f * (i % 5), 0.2421875f * (i / 5 + 1)); matManager.vChainNum[1].TCoords = vector2df(0.19375f * (i % 5 + 1), 0.2421875f * (i / 5));
matManager.vChainNum[3].TCoords = vector2df(0.19375f * (i % 5 + 1), 0.2421875f * (i / 5 + 1)); matManager.vChainNum[2].TCoords = vector2df(0.19375f * (i % 5), 0.2421875f * (i / 5 + 1));
driver->setMaterial(matManager.mTRTexture); matManager.vChainNum[3].TCoords = vector2df(0.19375f * (i % 5 + 1), 0.2421875f * (i / 5 + 1));
driver->setTransform(irr::video::ETS_WORLD, it); driver->setMaterial(matManager.mTRTexture);
driver->drawVertexPrimitiveList(matManager.vChainNum, 4, matManager.iRectangle, 2); driver->setTransform(irr::video::ETS_WORLD, it);
driver->drawVertexPrimitiveList(matManager.vChainNum, 4, matManager.iRectangle, 2);
}
} }
//finish button //finish button
if(btnCancelOrFinish->isVisible() && dField.select_ready) if(btnCancelOrFinish->isVisible() && dField.select_ready)
......
gframe/duelclient.cpp
View file @ be988d54
...@@ -2906,13 +2906,15 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2906,13 +2906,15 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
int ct = BufferIO::ReadInt8(pbuf); int ct = BufferIO::ReadInt8(pbuf);
if(mainGame->dInfo.isReplay && mainGame->dInfo.isReplaySkiping) if(mainGame->dInfo.isReplay && mainGame->dInfo.isReplaySkiping)
return true; return true;
if(mainGame->dField.last_chain) if (mainGame->dField.chains.size() > 1) {
mainGame->WaitFrameSignal(11); if (mainGame->dField.last_chain)
for(int i = 0; i < 5; ++i) { mainGame->WaitFrameSignal(11);
mainGame->dField.chains[ct - 1].solved = false; for(int i = 0; i < 5; ++i) {
mainGame->WaitFrameSignal(3); mainGame->dField.chains[ct - 1].solved = false;
mainGame->dField.chains[ct - 1].solved = true; mainGame->WaitFrameSignal(3);
mainGame->WaitFrameSignal(3); mainGame->dField.chains[ct - 1].solved = true;
mainGame->WaitFrameSignal(3);
}
} }
mainGame->dField.last_chain = false; mainGame->dField.last_chain = false;
return true; return true;
......
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