# HG changeset patch
# User nemo
# Date 1243170099 0
# Node ID 580f7610d6611eb2fc2f9c2456c156003433a08c
# Parent  b2c50a7480ea7777c627738c821a6b259f809ce4
Allow CJK override for zh_CN/zh_TW/ja

diff -r b2c50a7480ea -r 580f7610d661 hedgewars/hwengine.dpr
--- a/hedgewars/hwengine.dpr	Sun May 24 13:01:33 2009 +0000
+++ b/hedgewars/hwengine.dpr	Sun May 24 13:01:39 2009 +0000
@@ -416,6 +416,10 @@
 begin
 WriteLnToConsole('Hedgewars ' + cVersionString + ' engine');
 GetParams;
+// hack in font with support for CJK
+if (cLocaleFName = 'zh_CN.txt') or (cLocaleFName = 'zh_TW.txt') or (cLocaleFName = 'ja.txt') then
+    Fontz:= FontzCJK;
+
 Randomize;
 
 if GameType = gmtLandPreview then GenLandPreview
diff -r b2c50a7480ea -r 580f7610d661 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Sun May 24 13:01:33 2009 +0000
+++ b/hedgewars/uConsts.pas	Sun May 24 13:01:39 2009 +0000
@@ -113,7 +113,7 @@
 			Handle: PTTF_Font;
 			Height: LongInt;
 			style: LongInt;
-			Name: string[19];
+			Name: string[21];
 			end;
 
 	PAmmo = ^TAmmo;
@@ -297,6 +297,21 @@
 			Name: 'DejaVuSans-Bold.ttf')
 			);
 
+	FontzCJK: array[THWFont] of THHFont = (
+			(Handle: nil;
+			Height: 12;
+			style: TTF_STYLE_NORMAL;
+			Name: 'DroidSansFallback.ttf'),
+			(Handle: nil;
+			Height: 24;
+			style: TTF_STYLE_NORMAL;
+			Name: 'DroidSansFallback.ttf'),
+			(Handle: nil;
+			Height: 10;
+			style: TTF_STYLE_NORMAL;
+			Name: 'DroidSansFallback.ttf')
+			);
+
 	FontBorder = 2;
 
 	PathPrefix: string = './';
diff -r b2c50a7480ea -r 580f7610d661 share/hedgewars/Data/Fonts/CMakeLists.txt
--- a/share/hedgewars/Data/Fonts/CMakeLists.txt	Sun May 24 13:01:33 2009 +0000
+++ b/share/hedgewars/Data/Fonts/CMakeLists.txt	Sun May 24 13:01:39 2009 +0000
@@ -1,3 +1,4 @@
 install(FILES
 	DejaVuSans-Bold.ttf
+	DroidSansFallback.ttf
 	DESTINATION ${SHAREPATH}Data/Fonts)
diff -r b2c50a7480ea -r 580f7610d661 share/hedgewars/Data/Fonts/DroidSansFallback.ttf
Binary file share/hedgewars/Data/Fonts/DroidSansFallback.ttf has changed