From a0538d97d34b1d00ea0d6b9bd715be338bfa0a01 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Tue, 25 Mar 2014 12:54:27 +0200
Subject: [PATCH] Game font constant

---
 src/com/annimon/turrets/Constants.java  | 3 ++-
 src/com/annimon/turrets/GameCanvas.java | 9 +++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/com/annimon/turrets/Constants.java b/src/com/annimon/turrets/Constants.java
index e3d4eb1..14c5753 100644
--- a/src/com/annimon/turrets/Constants.java
+++ b/src/com/annimon/turrets/Constants.java
@@ -1,6 +1,7 @@
 package com.annimon.turrets;
 
 import java.awt.Dimension;
+import java.awt.Font;
 
 /**
  *
@@ -12,7 +13,7 @@ public final class Constants {
     public static final int WIDTH = 800, HEIGHT = 600;
     public static final boolean RESIZABLE = false;
     public static final Dimension SCREEN_DIMENSION = new Dimension(WIDTH, HEIGHT);
-    public static final String FONT_NAME = "Times New Roman";
+    public static final Font GAME_FONT = new Font("Times New Roman", Font.PLAIN, 24);
     
     // Parameters
     public static final boolean DEBUG_MODE = true;
diff --git a/src/com/annimon/turrets/GameCanvas.java b/src/com/annimon/turrets/GameCanvas.java
index febebf1..efccc59 100644
--- a/src/com/annimon/turrets/GameCanvas.java
+++ b/src/com/annimon/turrets/GameCanvas.java
@@ -1,6 +1,6 @@
 package com.annimon.turrets;
 
-import static com.annimon.turrets.Constants.FONT_NAME;
+import static com.annimon.turrets.Constants.GAME_FONT;
 import static com.annimon.turrets.Constants.MAX_ROUNDS;
 import com.annimon.turrets.Turret.TurretInfo;
 import com.annimon.turrets.network.GameClient;
@@ -10,7 +10,6 @@ import com.annimon.turrets.network.SocketHelper;
 import com.annimon.turrets.util.ExceptionHandler;
 import com.annimon.turrets.util.Util;
 import java.awt.Color;
-import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -28,7 +27,6 @@ public final class GameCanvas extends DoubleBufferedCanvas implements Runnable,
     private static final String WIN_MESSAGE = "YOU WIN", LOOSE_MESSAGE = "YOU LOOSE";
 
     private final BufferedImage background;
-    private final Font font;
     private Terrain terrain;
     private Turret serverTurret, clientTurret;
     private Turret instanceTurret;
@@ -46,7 +44,6 @@ public final class GameCanvas extends DoubleBufferedCanvas implements Runnable,
         
         background = new BufferedImage(Constants.WIDTH, Constants.HEIGHT, BufferedImage.TYPE_INT_RGB);
         initBackground();
-        font = new Font(FONT_NAME, Font.PLAIN, 24);
         
         wind = new Wind();
         gameStarted = false;
@@ -58,9 +55,9 @@ public final class GameCanvas extends DoubleBufferedCanvas implements Runnable,
     
     @Override
     protected void draw(Graphics2D g) {
-        final FontMetrics metrics = g.getFontMetrics(font);
+        final FontMetrics metrics = g.getFontMetrics(GAME_FONT);
         g.drawImage(background, 0, 0, null);
-        g.setFont(font);
+        g.setFont(GAME_FONT);
         if (winState != NOTHING) {
             g.setColor(Color.WHITE);
             final String text = (winState == WIN) ? WIN_MESSAGE : LOOSE_MESSAGE;