From 0dea1d14714569ed4eff66831f4f7fca0ecca7c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Tue, 8 Oct 2013 23:04:36 +0200
Subject: [PATCH] renamed and relocated fonts

---
 mods/cnc/chrome/ingame.yaml           |   2 +-
 mods/cnc/mod.yaml                     |   4 ++--
 Dune2k.ttf => mods/d2k/Dune2k.ttf     | Bin
 mods/d2k/mod.yaml                     |   2 +-
 titles.ttf => mods/ra/ZoodRangmah.ttf | Bin
 mods/ra/mod.yaml                      |   2 +-
 packaging/package-all.sh              |   2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename Dune2k.ttf => mods/d2k/Dune2k.ttf (100%)
 rename titles.ttf => mods/ra/ZoodRangmah.ttf (100%)

diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
index 1397667cee..ec39311aac 100644
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -3,7 +3,7 @@ Container@INGAME_ROOT:
 	Children:
 		Timer@GAME_TIMER:
 			X: WINDOW_RIGHT/2
-			Y: 0-10
+			Y: 0
 		StrategicProgress@STRATEGIC_PROGRESS:
 			X: WINDOW_RIGHT/2
 			Y: 40
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index a3976513fa..897e8fdb99 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -139,8 +139,8 @@ Fonts:
 		Font:FreeSansBold.ttf
 		Size:14
 	Title:
-		Font:titles.ttf
-		Size:48
+		Font:FreeSansBold.ttf
+		Size:32
 	MediumBold:
 		Font:FreeSansBold.ttf
 		Size:18
diff --git a/Dune2k.ttf b/mods/d2k/Dune2k.ttf
similarity index 100%
rename from Dune2k.ttf
rename to mods/d2k/Dune2k.ttf
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 631bdc5162..ce74fa3fe8 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -124,7 +124,7 @@ Fonts:
 		Font:FreeSansBold.ttf
 		Size:14
 	Title:
-		Font:Dune2k.ttf
+		Font:mods/d2k/Dune2k.ttf
 		Size:32
 	BigBold:
 		Font:FreeSansBold.ttf
diff --git a/titles.ttf b/mods/ra/ZoodRangmah.ttf
similarity index 100%
rename from titles.ttf
rename to mods/ra/ZoodRangmah.ttf
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index dfc6dda6e3..0e904c6a39 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -142,7 +142,7 @@ Fonts:
 		Font:FreeSansBold.ttf
 		Size:14
 	Title:
-		Font:titles.ttf
+		Font:mods/ra/ZoodRangmah.ttf
 		Size:48
 	BigBold:
 		Font:FreeSansBold.ttf
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index c4bc9d72bc..87b55facee 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -30,7 +30,7 @@ markdown DOCUMENTATION.md > DOCUMENTATION.html
 # they are now installed to the game directory instead of placed in the gac
 FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \
 'OpenRA.FileFormats.dll' 'OpenRA.Renderer.SdlCommon.dll' 'OpenRA.Renderer.Cg.dll' 'OpenRA.Renderer.Gl.dll' 'OpenRA.Renderer.Null.dll' 'OpenRA.Irc.dll' \
-'FreeSans.ttf' 'FreeSansBold.ttf' 'titles.ttf' 'Dune2k.ttf' \
+'FreeSans.ttf' 'FreeSansBold.ttf' \
 'cg' 'glsl' 'mods/ra' 'mods/cnc' 'mods/d2k' \
 'AUTHORS' 'COPYING' 'HACKING' 'INSTALL' 'CHANGELOG' \
 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' \