Merge branch 'master' into server

eab2b94a · nanahira · 20f448dd · 78e4e6af · eab2b94a · eab2b94a
Commit eab2b94a authored May 25, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

cards.cdb cards.cdb +0 -0

gframe/drawing.cpp gframe/drawing.cpp +2 -2

script script +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/drawing.cpp
+++ b/gframe/drawing.cpp
@@ -531,7 +531,7 @@ void Game::DrawMisc() {
 		}
 	}
 	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(800, 32, 818, 50, 818, 41), recti(0, 0, 128, 128), 0, 0, true);
 		}

--- a/script @ 75642a65
+++ b/script @ 75642a65
-Subproject commit 7ee7119c5021ecc3b093e0ba49460e08de714d4f
+Subproject commit 75642a650eb8a77752aa52c9d3e70678ddaea56b