From 9876be2200996c5005f45f87771e91c39d208796 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sun, 22 Jul 2012 10:32:07 +0200
Subject: Replaced font with DejaVu Serif Condensed

Looks nicer in the game in my opinion.
---
 data/fonts/CMakeLists.txt                |   4 ++--
 data/fonts/DejaVuSerifCondensed-Bold.ttf | Bin 0 -> 316440 bytes
 data/fonts/DejaVuSerifCondensed.ttf      | Bin 0 -> 330012 bytes
 data/fonts/dejavusans-bold.ttf           | Bin 672300 -> 0 bytes
 data/fonts/dejavusans.ttf                | Bin 720012 -> 0 bytes
 src/defaults.cpp                         |   4 ++--
 src/gui/gui.cpp                          |   4 ++--
 7 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 data/fonts/DejaVuSerifCondensed-Bold.ttf
 create mode 100644 data/fonts/DejaVuSerifCondensed.ttf
 delete mode 100644 data/fonts/dejavusans-bold.ttf
 delete mode 100644 data/fonts/dejavusans.ttf

diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt
index f5812e5d..61ea9805 100644
--- a/data/fonts/CMakeLists.txt
+++ b/data/fonts/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET (FILES
-    dejavusans.ttf
-    dejavusans-bold.ttf
+    DejaVuSerifCondensed.ttf
+    DejaVuSerifCondensed-Bold.ttf
     dejavusans-mono.ttf
     )
 
diff --git a/data/fonts/DejaVuSerifCondensed-Bold.ttf b/data/fonts/DejaVuSerifCondensed-Bold.ttf
new file mode 100644
index 00000000..55adca41
Binary files /dev/null and b/data/fonts/DejaVuSerifCondensed-Bold.ttf differ
diff --git a/data/fonts/DejaVuSerifCondensed.ttf b/data/fonts/DejaVuSerifCondensed.ttf
new file mode 100644
index 00000000..83120cd9
Binary files /dev/null and b/data/fonts/DejaVuSerifCondensed.ttf differ
diff --git a/data/fonts/dejavusans-bold.ttf b/data/fonts/dejavusans-bold.ttf
deleted file mode 100644
index 0f4d5e9d..00000000
Binary files a/data/fonts/dejavusans-bold.ttf and /dev/null differ
diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf
deleted file mode 100644
index 27cff476..00000000
Binary files a/data/fonts/dejavusans.ttf and /dev/null differ
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 0dc8e3ed..e8a6e6e6 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -142,8 +142,8 @@ DefaultsData* getBrandingDefaults()
     AddDEF(brandingData, "onlineServerList", "");
     AddDEF(brandingData, "guiThemePath", "");
     AddDEF(brandingData, "theme", "");
-    AddDEF(brandingData, "font", "fonts/dejavusans.ttf");
-    AddDEF(brandingData, "boldFont", "fonts/dejavusans-bold.ttf");
+    AddDEF(brandingData, "font", "fonts/DejaVuSerifCondensed.ttf");
+    AddDEF(brandingData, "boldFont", "fonts/DejaVuSerifCondensed-Bold.ttf");
     AddDEF(brandingData, "monoFont", "fonts/dejavusans-mono.ttf");
 
     return brandingData;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index e6e61f64..1b600a3d 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -112,7 +112,7 @@ Gui::Gui(Graphics *graphics):
 
     // Set global font
     const int fontSize = config.getValue("fontSize", 11);
-    std::string fontFile = branding.getValue("font", "fonts/dejavusans.ttf");
+    std::string fontFile = branding.getValue("font", "fonts/DejaVuSerifCondensed.ttf");
     std::string path = resman->getPath(fontFile);
 
     try
@@ -127,7 +127,7 @@ Gui::Gui(Graphics *graphics):
     }
 
     // Set bold font
-    fontFile = branding.getValue("boldFont", "fonts/dejavusans-bold.ttf");
+    fontFile = branding.getValue("boldFont", "fonts/DejaVuSerifCondensed-Bold.ttf");
     path = resman->getPath(fontFile);
     try
     {
-- 
cgit v1.2.3-70-g09d2