Move clock to not overlap objectives (fixes #127)

cxong · Jul 20, 2013 · d422f33 · d422f33
1 parent 278ac78
commit d422f33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/src/cdogs/hud.c b/src/cdogs/hud.c
@@ -76,7 +76,7 @@ void FPSCounterDraw(FPSCounter *counter)
 	char s[50];
 	counter->framesDrawn++;
 	sprintf(s, "FPS: %d", counter->fps);
-	CDogsTextStringSpecial(s, TEXT_RIGHT | TEXT_BOTTOM, 10, 10);
+	CDogsTextStringSpecial(s, TEXT_RIGHT | TEXT_BOTTOM, 10, 5 + CDogsTextHeight());
 }
 
 void WallClockSetTime(WallClock *wc)
@@ -104,7 +104,7 @@ void WallClockDraw(WallClock *wc)
 {
 	char s[50];
 	sprintf(s, "%02d:%02d", wc->hours, wc->minutes);
-	CDogsTextStringSpecial(s, TEXT_LEFT | TEXT_BOTTOM, 10, 10);
+	CDogsTextStringSpecial(s, TEXT_LEFT | TEXT_BOTTOM, 10, 5 + CDogsTextHeight());
 }
 
 void HUDInit(

diff --git a/src/cdogs/vector.c b/src/cdogs/vector.c
@@ -50,14 +50,6 @@ void CalcChebyshevDistanceAndBearing(
 	}
 }
 
-static Vector2i Minus(Vector2i a, Vector2i b)
-{
-	Vector2i x;
-	x.x = a.x - b.x;
-	x.y = a.y - b.y;
-	return x;
-}
-
 static int DistanceSquared(Vector2i a, Vector2i b)
 {
 	int dx = a.x - b.x;