From 2748eeb367349fd98b36c8ba89fe6c2fafe9f9ae Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Wed, 24 Nov 2021 13:32:09 +0900
Subject: [PATCH] typewriter keymap minor change

---
 FontTestGDX/src/FontTestGDX.kt                |   1 -
 assets/typewriter/typewriter_ko_3set-390.tga  | Bin 327698 -> 327698 bytes
 .../gdx/TerrarumTypewriterBitmap.kt           |  11 ++++++++---
 .../typewriter_ko_3set-390.psd                | Bin 170597 -> 170597 bytes
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/FontTestGDX/src/FontTestGDX.kt b/FontTestGDX/src/FontTestGDX.kt
index b851c16..74d0415 100755
--- a/FontTestGDX/src/FontTestGDX.kt
+++ b/FontTestGDX/src/FontTestGDX.kt
@@ -34,7 +34,6 @@ class FontTestGDX : Game() {
     private lateinit var faketex: Texture
 
     override fun create() {
-        font = TerrarumSansBitmap("./assets", flipY = false, errorOnUnknownChar = false, shadowAlpha = 0.796f) // must test for two flipY cases
         font = TerrarumSansBitmap("./assets", debug = true, flipY = false, errorOnUnknownChar = false, shadowAlpha = 0.796f) // must test for two flipY cases
 
         val inTextFile = Gdx.files.internal("./$demotextName")
diff --git a/assets/typewriter/typewriter_ko_3set-390.tga b/assets/typewriter/typewriter_ko_3set-390.tga
index 43571ef53902c8e00b0be1c46aee04b51346c700..6c654cd0f52d4c84da3974dfc18edbfeb9e2ac60 100644
GIT binary patch
delta 623
zcmbQ#ATp^zq+tuAUF3GVyUZbsljk`}Z(ke5n9DT1zn_V1yTV=OBF5=<JdEPga}Aj_
zH_J8nKxC!^W!R=`J!IC{XyAaVA^@Ud@_`ks({-ORtAZ3j%uQpgWSS1NM+9V90^>x3
zmhE!cj2viUKucI4LJ&7N{AIqzIQ^b9v-0M>PH!2(f*|X;rdvH^me^k4%Xo(wEC{wy
z^&zw9c0WcIpcv2+3Ahn_T<w1Cj6lq^-LIYbL*Pb(1fZd@%oDcDJz*+f1~Gd;uK5BK
zRb?~**{3o&Z=1<Rg9^s!^WHPnY&2+qN{P8L%WThk%DjVlqrneGpmTeeCmNK1X^?Ba
dFmIptjk$vfq!Ys0{-K%a73+v5f#EWb1pp3z3sL|8

delta 648
zcmbQ#ATp^zq+tuAUF1fC5XQ;#oTRs}jbhAY+GtS0INgqiQG9x?A+zRYxdtDm?Q-9l
zORx(<^rbOY0`>i1oV;&!&1Qv^7Uu18ubICvProP4th{-zmk{sv2d9|wSvMNYU~Knm
z2Vth|e(lU30;kJ0GAe8|aA4d%?-p|n)Aas+CbsPgv5ZBG6AgH#--~7L0T~H)5=d$~
zP>OB3RwAPY$Y_=AcBzaZK$Q{G=e=hFs%l{b8!-963fAemsf?=A#ax+Xw&y)%-oXsA
zNCaxz5k{b|IG8YmSfD~+M>y0n-eaC<zyUT9WG~ltt3<{Kplu=`cQt^*1ZW0GE!aNQ
jL`Kogb~O=<a9N0P5)eNDjpO5jgu*BZ4S@n*Mn@I^f~f)r

diff --git a/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt b/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
index d4a0630..8f9433f 100644
--- a/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
+++ b/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
@@ -585,9 +585,14 @@ class TerrarumTypewriterBitmap(
         val hashPrime = 1099511628211L
         var hashAccumulator = hashBasis
 
-        this.forEach {
-            hashAccumulator = hashAccumulator xor it.toLong()
-            hashAccumulator *= hashPrime
+        if (this != null) {
+            this.forEach {
+                hashAccumulator = hashAccumulator xor it.toLong()
+                hashAccumulator *= hashPrime
+            }
+        }
+        else {
+            System.err.println("CodepointSequence is null?!")
         }
 
         return hashAccumulator
diff --git a/work_files/typewriter_input/typewriter_ko_3set-390.psd b/work_files/typewriter_input/typewriter_ko_3set-390.psd
index 55287c7b6ce5cdd8707c3180beed946df45daaa9..1e42bf84b57752d683aea8a25c47c1ab748e6e82 100644
GIT binary patch
delta 1839
zcmeH_Pe>GT6vy9tt;@JAtFvTUxZ6@~NSY*hD6|b!Xb=;_A|uEWln!Neh)$u~-dqpD
zkgr?b^q?eY4IOmno(o;vpv-MImTuB<n{E5`8^<ysI%yq>$GqSB^ZmWw<HO|UJ-K<$
zY(7jNVpiC&!l+eLDBy*1u>DV_H++oon<ku6RZyW)nn#)o{NQJ9#*3{6fQZ5eFhK}w
zBTmTJEkBvA_ZGpDXBHM@p}4Nu67yIOR+L2{BL!cD+{qTR*@OEG|7mogaWsNqWhe@1
z*flKH)C^F}lKw{_3p6Z--b2Fa=K<9<ON`r@7)o!J$+wU!yksENdiYLWPy8Z!yg4@K
zj9YaoUi<0qC9Xb;!QT*@?ZT;X4PB)^@JXZ!xHzt%_D5*#Zbz-8*M?IR841(@RTNnn
z+l-1L4|z$aC~P!N#<J%S*?KxOiXta<4u_5SKY)Mz4=|oz$7AO!JK-u^fj+nZU7$f5
zG{SMHgClx$@SZ+4sPO$coL1Z6k`(kohm<r+(MkPNLyV1ioc@dV4dVq)?jLWVDsJwl
zT3-E(C%8U9r}$|LdG)S|y&PJ`CLWBFTfdtKa>oEgI2o7HnE?uOV3h7~GDsm#7cj&V
zDd|Sr<g`~QtmdUQx@l;yvHPID_+$@17@=DI_DUVU9gz<#^^?M(ICZiapi(YtrORwC
z;~}muV3=<O>6+eaHnJ#S4Vx(}=QCfhW-e_;6yuqTd{sNT^vnU;=B2s3o7_g|94R}y
Rx&OxYZhlyq?0-Zh-vDnK&2|6)

delta 1699
zcmeHEUr5tY6h7zrr=@Fi=G1KJC|3gq74;I+F;r+o^AGkHWGiA2B&$6{1i@xLL?uyN
z>bzBNt{5a}{OCd5V_;EGn-Dd1uzV4*msmetx4W%y8NDeK#Nqtzz2~0u-S7K;sj;%u
zSlLM0!Vm{li=tZ4W#n%@6&IC5Io~&bm)_ekY}^VpV1g>BkfDWI8CuX1Z^2_U+kzV7
zBou|jqG13Mu)3vy6Sq;Q6&JD}lhW@%izcW5h$s2>IbegTVGg1ogt}Tz0t<=YtV9x`
zRHnQU89>9LD(+_oMQ{ctKou*%bmOm<rwEuqz4j5tWn)I>jX#_xviJ0*2lczdc><~Y
zl8~d{1e4D^{<ThBtx`e#A*`p_1E`^gSFnjY=lf}-8^Z=2R6;fAa-o&`O1kbsSI!Xq
zBxFS1joiA{3Vk2CO1yb1GGb1?Ug$zbBxPl-0coi|BYsLx3z9vBqJKNlQV$xphviU8
zW}(O*mH+bo`M;+qXVBJDa~Mv@@WByqffHK523BZ-U3|cQiQn;S=<+B=jGf?tli-D;
z&<!23)d_pS#smH!DPtJ<3osPrIS$v+%vY=;r;j!B3m<Isz{d`f`xeviw`Z$qPYmtk
zXlI*wV6uU3$IwBK+SyL(YhV^~53$oU6h|{}OhlETY3$uWo_APF<2P9|o%gZ*^t4T)
zZHb|lmfBb+y{>1alvME)y^LWqd6v;arZ`^Y-l&Np5{a&MFe@#@B}mr_TFE?({i8F9
s7n^vOy-s;n%yhNu#rJa~+hD#_(aTB|vzuwwjr8$z8%cWDcaN2P2gZB1{r~^~