Skip to content

Y
ygopro
You need to sign in or sign up before continuing.
Commit eab2b94a authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 20f448dd 78e4e6af
Show 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);
} }
......
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