Skip to content

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

Merge branch 'master' into server

parents 20f448dd 78e4e6af
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cards.cdb
View file @ eab2b94a
No preview for this file type
gframe/drawing.cpp
View file @ eab2b94a
...@@ -531,7 +531,7 @@ void Game::DrawMisc() { ...@@ -531,7 +531,7 @@ void Game::DrawMisc() {
} }
} }
if(!dInfo.isReplay && dInfo.player_type < 7 && dInfo.time_limit) { if(!dInfo.isReplay && dInfo.player_type < 7 && dInfo.time_limit) {
if(imageManager.tClock != NULL) { if(imageManager.tClock) {
driver->draw2DImage(imageManager.tClock, ResizeCardMid(472, 32, 490, 50, 490, 41), recti(0, 0, 128, 128), 0, 0, true); driver->draw2DImage(imageManager.tClock, ResizeCardMid(472, 32, 490, 50, 490, 41), recti(0, 0, 128, 128), 0, 0, true);
driver->draw2DImage(imageManager.tClock, ResizeCardMid(800, 32, 818, 50, 818, 41), recti(0, 0, 128, 128), 0, 0, true); driver->draw2DImage(imageManager.tClock, ResizeCardMid(800, 32, 818, 50, 818, 41), recti(0, 0, 128, 128), 0, 0, true);
} }
...@@ -558,7 +558,7 @@ void Game::DrawMisc() { ...@@ -558,7 +558,7 @@ void Game::DrawMisc() {
} }
DrawShadowText(numFont, dInfo.strLP[0], Resize(330, 12, 631, 30), Resize(0, 1, 2, 0), 0xffffff00, 0xff000000, true, false, 0); DrawShadowText(numFont, dInfo.strLP[0], Resize(330, 12, 631, 30), Resize(0, 1, 2, 0), 0xffffff00, 0xff000000, true, false, 0);
DrawShadowText(numFont, dInfo.strLP[1], Resize(691, 12, 992, 30), Resize(0, 1, 2, 0), 0xffffff00, 0xff000000, true, false, 0); DrawShadowText(numFont, dInfo.strLP[1], Resize(691, 12, 992, 30), Resize(0, 1, 2, 0), 0xffffff00, 0xff000000, true, false, 0);
recti p1size = Resize(335, 31, 629, 50); recti p1size = Resize(335, 31, 629, 50);
recti p2size = Resize(986, 31, 986, 50); recti p2size = Resize(986, 31, 986, 50);
if(!dInfo.isTag || !dInfo.tag_player[0]) if(!dInfo.isTag || !dInfo.tag_player[0])
......
script @ 75642a65
Subproject commit 7ee7119c5021ecc3b093e0ba49460e08de714d4f Subproject commit 75642a650eb8a77752aa52c9d3e70678ddaea56b
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