diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-07-22 10:32:07 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-07-22 10:32:47 +0200 |
commit | 9876be2200996c5005f45f87771e91c39d208796 (patch) | |
tree | 4133dc5bc103027d10d6d45f17c5c61816024950 | |
parent | 85e02a1955b4eaee9e300616b5af0e839735f6e7 (diff) | |
download | mana-9876be2200996c5005f45f87771e91c39d208796.tar.gz mana-9876be2200996c5005f45f87771e91c39d208796.tar.bz2 mana-9876be2200996c5005f45f87771e91c39d208796.tar.xz mana-9876be2200996c5005f45f87771e91c39d208796.zip |
Replaced font with DejaVu Serif Condensed
Looks nicer in the game in my opinion.
-rw-r--r-- | data/fonts/CMakeLists.txt | 4 | ||||
-rw-r--r-- | data/fonts/DejaVuSerifCondensed-Bold.ttf | bin | 0 -> 316440 bytes | |||
-rw-r--r-- | data/fonts/DejaVuSerifCondensed.ttf | bin | 0 -> 330012 bytes | |||
-rw-r--r-- | data/fonts/dejavusans-bold.ttf | bin | 672300 -> 0 bytes | |||
-rw-r--r-- | data/fonts/dejavusans.ttf | bin | 720012 -> 0 bytes | |||
-rw-r--r-- | src/defaults.cpp | 4 | ||||
-rw-r--r-- | src/gui/gui.cpp | 4 |
7 files changed, 6 insertions, 6 deletions
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 Binary files differnew file mode 100644 index 00000000..55adca41 --- /dev/null +++ b/data/fonts/DejaVuSerifCondensed-Bold.ttf diff --git a/data/fonts/DejaVuSerifCondensed.ttf b/data/fonts/DejaVuSerifCondensed.ttf Binary files differnew file mode 100644 index 00000000..83120cd9 --- /dev/null +++ b/data/fonts/DejaVuSerifCondensed.ttf diff --git a/data/fonts/dejavusans-bold.ttf b/data/fonts/dejavusans-bold.ttf Binary files differdeleted file mode 100644 index 0f4d5e9d..00000000 --- a/data/fonts/dejavusans-bold.ttf +++ /dev/null diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf Binary files differdeleted file mode 100644 index 27cff476..00000000 --- a/data/fonts/dejavusans.ttf +++ /dev/null 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 { |