Skip to content

Y
ygopro
Commit 94f7e54b authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent 24378f13
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
gframe/drawing.cpp
View file @ 94f7e54b
...@@ -281,6 +281,20 @@ void Game::DrawCard(ClientCard* pcard) { ...@@ -281,6 +281,20 @@ void Game::DrawCard(ClientCard* pcard) {
} }
if(pcard->is_moving) if(pcard->is_moving)
return; return;
if(pcard->is_selectable && (pcard->location & 0xe)) {
float cv[4] = {1.0f, 1.0f, 0.0f, 1.0f};
if((pcard->location == LOCATION_HAND && pcard->code) || ((pcard->location & 0xc) && (pcard->position & POS_FACEUP)))
DrawSelectionLine(matManager.vCardOutline, !pcard->is_selected, 2, cv);
else
DrawSelectionLine(matManager.vCardOutliner, !pcard->is_selected, 2, cv);
}
if(pcard->is_highlighting) {
float cv[4] = {0.0f, 1.0f, 1.0f, 1.0f};
if((pcard->location == LOCATION_HAND && pcard->code) || ((pcard->location & 0xc) && (pcard->position & POS_FACEUP)))
DrawSelectionLine(matManager.vCardOutline, true, 2, cv);
else
DrawSelectionLine(matManager.vCardOutliner, true, 2, cv);
}
irr::core::matrix4 im; irr::core::matrix4 im;
im.setTranslation(pcard->curPos); im.setTranslation(pcard->curPos);
driver->setTransform(irr::video::ETS_WORLD, im); driver->setTransform(irr::video::ETS_WORLD, im);
...@@ -301,20 +315,6 @@ void Game::DrawCard(ClientCard* pcard) { ...@@ -301,20 +315,6 @@ void Game::DrawCard(ClientCard* pcard) {
driver->setMaterial(matManager.mTexture); driver->setMaterial(matManager.mTexture);
driver->drawVertexPrimitiveList(matManager.vNegate, 4, matManager.iRectangle, 2); driver->drawVertexPrimitiveList(matManager.vNegate, 4, matManager.iRectangle, 2);
} }
if(pcard->is_selectable && (pcard->location & 0xe)) {
float cv[4] = {1.0f, 1.0f, 0.0f, 1.0f};
if((pcard->location == LOCATION_HAND && pcard->code) || ((pcard->location & 0xc) && (pcard->position & POS_FACEUP)))
DrawSelectionLine(matManager.vCardOutline, !pcard->is_selected, 2, cv);
else
DrawSelectionLine(matManager.vCardOutliner, !pcard->is_selected, 2, cv);
}
if(pcard->is_highlighting) {
float cv[4] = {0.0f, 1.0f, 1.0f, 1.0f};
if((pcard->location == LOCATION_HAND && pcard->code) || ((pcard->location & 0xc) && (pcard->position & POS_FACEUP)))
DrawSelectionLine(matManager.vCardOutline, true, 2, cv);
else
DrawSelectionLine(matManager.vCardOutliner, true, 2, cv);
}
if(pcard->cmdFlag & COMMAND_ATTACK) { if(pcard->cmdFlag & COMMAND_ATTACK) {
matManager.mTexture.setTexture(0, imageManager.tAttack); matManager.mTexture.setTexture(0, imageManager.tAttack);
driver->setMaterial(matManager.mTexture); driver->setMaterial(matManager.mTexture);
......
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