From ec57deb49dfabc95d52bb5d07dffdded07512e33 Mon Sep 17 00:00:00 2001
From: Ketmar Dark <ketmar@ketmar.no-ip.org>
Date: Tue, 26 Apr 2016 19:27:50 +0300
Subject: [PATCH] 8x8 console font

---
 d2dfont.d                 |   9 ++++++---
 data/console/confont8.png | Bin 0 -> 1057 bytes
 render.d                  |   1 +
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 data/console/confont8.png

diff --git a/d2dfont.d b/d2dfont.d
index d089714..d58d358 100644
--- a/d2dfont.d
+++ b/d2dfont.d
@@ -220,11 +220,14 @@ public int bfTextHeight (const(char)[] str) { return fontTextHeight(bffont, str)
 // ////////////////////////////////////////////////////////////////////////// //
 __gshared Texture conFontTex;
 __gshared GLuint conListBase;
-enum ConCharWdt = 10;
-enum ConCharHgt = 16;
+//enum ConCharWdt = 10;
+//enum ConCharHgt = 16;
+enum ConCharWdt = 8;
+enum ConCharHgt = 8;
 
 public void loadConFont () {
-  conFontTex = new Texture("console/confont.png", Texture.Option.Nearest);
+  //conFontTex = new Texture("console/confont.png", Texture.Option.Nearest);
+  conFontTex = new Texture("console/confont8.png", Texture.Option.Nearest);
   float iw = cast(float)conFontTex.width;
   float ih = cast(float)conFontTex.height;
   conListBase = glGenLists(256);
diff --git a/data/console/confont8.png b/data/console/confont8.png
new file mode 100644
index 0000000000000000000000000000000000000000..cadb227ded0722814474f9d429ff00d38036a19a
GIT binary patch
literal 1057
zcwPY^1m63JP)<h;3K|Lk000e1NJLTq004jh004jj0{{R3zEFu+00009P)t-s00017
zTwMSE|AeWPjsO4v0d!JMQvg8b*k%9#1I9^2K~z{r?Nh;u<2Vp4g;+#B^&tUSr#{Hd
z#$Ta<-C_IYfh0I{QiEa=e}!3gVUA)*H|aU~plxD*<vuyx%?@lI_MT_tIM!2Dz2_>T
zE3Wtnyv4Gty*zzL;AhUWNVA++%igGbT>Q2fvST8-XC`hw{P9kZuY}ExcVx5Ec*K6~
z-w75gp`>gEc4Dn{7eaDuhCQi)Xe7ooo1F@r+t&!`dHuMj#afPgh!Bfhc$uirG#0pf
zVr_-D^Ra{xNy!ZEEN12O<uBH{@%<bpI@a-XI*{Zk*1*o}Oz)U<#4BdAO|qpu{~P6P
zIIhu$TcR0>iZYI%6VmJ(FWCt(0Jveu$AYIbyn)u7&U^+hKa*uWdl`cpbw(UF5+)^W
z)PV34)^bkUm_pEEg`=K$&(3P#{bGx!9^auyIvCDLow03*t=MX@PF6I>T0!?JW}kqv
zSWOJI^dT&fh`&ukVeqMc@h{;eq#=mZ&@wES6hxS%p6Ytyb}n}Zci0}bdF3<$Yj@1(
zusn#|(XJM{@W)%7Y0^lqN5Y*Eba%MB2d`;_&K)*HVG8rTFT%uVU4W23>t`?Up^Kn1
zFSN+vmq)UR@jCa2_pA>f)HZiZ;q(Y{A*S$NKQD#8*Gs3Vv0gp}<$w6Wds17k1vSRI
zr{IOp6g(l5d@2+3n^_x!<}o)@THyYvG*go#hM?U?{Y4*UL3kbDLE5K?min<Hp&bt7
z+sETpI9%JKgDO#KVji7dLf#Pyl&OsnnZCPEP3CV<JZ$zD15HZ-iJEz+7Xk!sxS7BO
z*yWQy*IT*^-(BHvoq&hJ#|Uvdo+s2$43w9<Q+|r#v`$Uo@{^$AcYGv07AZkg&btO#
zmFFh+9<d%nQqqi-W9vfujk#HvDJ6!{jfp;(@`E1vPyEtdMwsE3_Ho{0%SuY$2*Ww;
zBq<C(@7Pg&0|8SJ$M(=ETp;9Db-Pk^S%tB6s^cwhB__14vT9d>U~N`e+F5m0<8#s`
ztwP(^Qc5eS=xm3F8Mao7qw3@=){xl?L261{Rn_5ZP$wQo&C1)cNDN$Uk;v18lIfRn
zQ6|5#6{n`1Pnl6PpC`07^EkvGV*vj3m;baG)4U9QB-EWcJwR{MNxQceOG-!ur3V4W
zpw+5sS8hscD_P4;%jK?pBVd>z(PlF0wm4g(dhRx(;X~68%|I$Z`#iB6PDoeFtYz@x
z65;trwx+C1V3+bNI^nZm_Yb}a7s5-dA!eD=!ccU=Ov`ev%sRG;c~x=66<1tw#T8dv
b@jvko6=FCn?^<rU00000NkvXXu0mjfpVs<h

literal 0
HcwPel00001

diff --git a/render.d b/render.d
index a9e88d3..e4d8f9f 100644
--- a/render.d
+++ b/render.d
@@ -302,6 +302,7 @@ void concliChar (char ch) {
   }
   // other
   if (ch < ' ' || ch > 127) return;
+  if (ch == '`' && conclilen == 0) return;
   if (conclilen >= concli.length) return;
   concli.ptr[conclilen++] = ch;
   conLastChange = 0;
-- 
2.11.4.GIT