# HG changeset patch
# User nemo
# Date 1267201740 0
# Node ID e7acb0251a2271f1beef3008ee299bb7f355d328
# Parent  6e911d72263a3a486c87f06703cc10ae5a01ac1b
Font switch requested by Copy Liu in issue #220 - a GPL CJK font set that includes some hand-drawn bitmaps for lower resolutions, reducing fuzziness of CJK chars in places like the ammo menu

diff -r 6e911d72263a -r e7acb0251a22 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Fri Feb 26 03:25:59 2010 +0000
+++ b/hedgewars/uConsts.pas	Fri Feb 26 16:29:00 2010 +0000
@@ -417,15 +417,15 @@
 			(Handle: nil;
 			Height: 12;
 			style: TTF_STYLE_NORMAL;
-			Name: 'DroidSansFallback.ttf'),
+			Name: 'wqy-zenhei.ttc'),
 			(Handle: nil;
 			Height: 24;
 			style: TTF_STYLE_NORMAL;
-			Name: 'DroidSansFallback.ttf'),
+			Name: 'wqy-zenhei.ttc'),
 			(Handle: nil;
 			Height: 10;
 			style: TTF_STYLE_NORMAL;
-			Name: 'DroidSansFallback.ttf')
+			Name: 'wqy-zenhei.ttc')
 			);
 
 	SpritesData: array[TSprite] of record
diff -r 6e911d72263a -r e7acb0251a22 hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Fri Feb 26 03:25:59 2010 +0000
+++ b/hedgewars/uStore.pas	Fri Feb 26 16:29:00 2010 +0000
@@ -244,7 +244,7 @@
 			with Hedgehogs[i] do
 				if Gear <> nil then
 					begin
-					NameTagTex:= RenderStringTex(Name, Clan^.Color, fnt16);
+					NameTagTex:= RenderStringTex(Name, Clan^.Color, CheckCJKFont(Name,fnt16));
 					if Hat <> 'NoHat' then
 						begin
 						texsurf:= LoadImage(Pathz[ptHats] + '/' + Hat, ifNone);
@@ -416,7 +416,7 @@
 for ai:= Low(TAmmoType) to High(TAmmoType) do
 	with Ammoz[ai] do
 		begin
-		tmpsurf:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(trAmmo[NameId]), cWhiteColorChannels);
+		tmpsurf:= TTF_RenderUTF8_Blended(Fontz[CheckCJKFont(trAmmo[NameId],fnt16)].Handle, Str2PChar(trAmmo[NameId]), cWhiteColorChannels);
 		tmpsurf:= doSurfaceConversion(tmpsurf);
 		NameTex:= Surface2Tex(tmpsurf, false);
 		SDL_FreeSurface(tmpsurf)
diff -r 6e911d72263a -r e7acb0251a22 share/hedgewars/Data/Fonts/CMakeLists.txt
--- a/share/hedgewars/Data/Fonts/CMakeLists.txt	Fri Feb 26 03:25:59 2010 +0000
+++ b/share/hedgewars/Data/Fonts/CMakeLists.txt	Fri Feb 26 16:29:00 2010 +0000
@@ -1,4 +1,4 @@
 install(FILES
 	DejaVuSans-Bold.ttf
-	DroidSansFallback.ttf
+    wqy-zenhei.ttc
 	DESTINATION ${SHAREPATH}Data/Fonts)
diff -r 6e911d72263a -r e7acb0251a22 share/hedgewars/Data/Fonts/wqy-zenhei.ttc
Binary file share/hedgewars/Data/Fonts/wqy-zenhei.ttc has changed