From 54e82e70b7b402a7aa8e08cf99844c10bc9e89c3 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sun, 9 Aug 2015 10:47:00 -0500 Subject: [PATCH] Signed-off-by: sparky4 --- 16.exe | Bin 39132 -> 39132 bytes DEBUG.16 | 24 ++++++++++++------------ HEAP.16 | 26 +++++++++++++------------- MMDUMP.16 | Bin 136 -> 110 bytes bakapi.exe | Bin 33804 -> 33804 bytes exmmtest.exe | Bin 44008 -> 44328 bytes fontgfx.exe | Bin 26664 -> 26664 bytes maptest.exe | Bin 31378 -> 31378 bytes palettec.exe | Bin 24492 -> 24492 bytes pcxtest.exe | Bin 35218 -> 35218 bytes scroll.exe | Bin 55884 -> 55884 bytes src/lib/16_mm.c | 35 +++++++++++++++++++---------------- src/lib/16_mm.h | 1 + test.exe | Bin 24780 -> 24780 bytes test2.exe | Bin 26702 -> 26702 bytes tsthimem.exe | Bin 21846 -> 21846 bytes 16 files changed, 45 insertions(+), 41 deletions(-) diff --git a/16.exe b/16.exe index 3d3f27977d3fd336b2bbb07502dcc9bc46899663..e078acbd2ab19ba630f30fa229e78a2168c2e002 100644 GIT binary patch delta 578 zcmcb!k?GDxrVS2ks;&|Y3<*Ho4a7Tv_&*R!Nis0(0%BPy28K8wuHKx=RwyC;uG8&B zr`xL+3_tsBcC)k|C}n=B#n^hgg!!fGSnQRU@SJ;$IPJZ_Qvp1 z=fUsaS}y?=nN2p5HxPNk&|LR{q4ay_jn4ZQA2c6l?sWSyxlGuEba14F=$$$SAX^7)#Nur$}bVJKq(x;wu&?N5AM>>(D0 z*4t&NNY+OJtq;Yt{-V5!JRh?4zyRp}2X}$Xzn7mUpH|Re6q)=(LEZMvUlbF7$}WOJ zNAp6rh~}Zr3yimdf&;(~I|y`G9&hszF1Se>|4#m?pq4_C3EXHVfGm%D*6q&nJ)P}; z*@K>o|H~d3{uk>F1IFU7Znrl$&(M@DIo> gagVy)UUjltm%S)re);DwP?H-_$LndEbCvST0HxF&00000 delta 563 zcmcb!k?GDxrVS2ks!kFN46#7m0mR#Y_$LsHNHQ>N1Y$uc28JLY&flEMRwyC;s?+U7 zr`x+13_tsBcC)k|C}n=B&e(dpg!!e@SnQRU@SJ;$IPJZ_Qvp1 z=fUsaS}y?=8BaEnHxPNq&|LR{q4ay_jn4ZQA2c6l?sWS!xlG8jd+=mmB`=U|8|d|k|KQep{d@U#@J0_*{R47H+@o%{ fcb)9kWiN`DU$XuK8sY{t;q^2IB(OPGDZdN=xCjV5 diff --git a/DEBUG.16 b/DEBUG.16 index f02d76dc..e132c9f5 100644 --- a/DEBUG.16 +++ b/DEBUG.16 @@ -1,12 +1,12 @@ -Seg:0 Size:5538 Owner:0xe000 -+_ -Seg:15a2 Size:256 Owner:0x3506 -+_ -Seg:16a2 Size:273 Owner:0x857a -+_0 -Seg:1cf2 Size:49 Owner:0x159f -+_0 -Seg:ad23 Size:13021 Owner:0x169f -+_ -Seg:e000 Size:4294909951 Owner:0xc483 -+_ +Seg:0 Size:5200 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ +Seg:1450 Size:256 Owner:0x3506 +++++_ +Seg:1550 Size:273 Owner:0x857a +++++_ +Seg:1bb9 Size:49 Owner:0x1fe6 +++_ +Seg:abea Size:13334 Owner:0x8586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ +Seg:e000 Size:8191 Owner:0x3b4 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ diff --git a/HEAP.16 b/HEAP.16 index a2a1a674..50a3d6e7 100644 --- a/HEAP.16 +++ b/HEAP.16 @@ -1,11 +1,11 @@ == default == - USED block at 1d140016 of size 136 - USED block at 1d14009e of size 66 - FREE block at 1d1400e0 of size 18 - USED block at 1d1400f2 of size 20 - FREE block at 1d140106 of size 7926 + USED block at 1bdb0016 of size 136 + USED block at 1bdb009e of size 66 + FREE block at 1bdb00e0 of size 18 + USED block at 1bdb00f2 of size 20 + FREE block at 1bdb0106 of size 7926 OK - end of heap == near == @@ -33,13 +33,13 @@ OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- Default 8166 222 7944 -Near 31318 834 30484 +Near 31318 436 30882 Far 8166 222 7944 ---------------- -------- -------- -------- -coreleft = 30482 -farcoreleft = 38230 -GetFreeSize = 7768 -GetNearFreeSize = 30484 -GetFarFreeSize = 7768 -memavl = 30482 -stackavail = 11023 +coreleft = 30880 +farcoreleft = 46820 +GetFreeSize = 15960 +GetNearFreeSize = 30882 +GetFarFreeSize = 15960 +memavl = 30880 +stackavail = 11025 diff --git a/MMDUMP.16 b/MMDUMP.16 index 66f20d2774fd6a48a598be0d28a0b4e1c057d483..8c1d8566d76e035a5f7a24b26d49659803ea5e62 100644 GIT binary patch delta 60 zcmeBR%u_X}FfcGlwlXkIGEvab{jaHDt6;#(1r;?+OEm+E8ctNT;6| Q3RjhCU|;~0Sp?M!0DAHh&?DQl|0h#I^AA$ zy1jbA@U!n`H%se*Qs$RhjIFmzm|wb1e#ob&@To8EL3i1sZWh}H#$uy=%naIYZwxPW z9{m2T^%78#*<>Yt1Cb{T&2=9bO22pB=)8aNLGy9uPPZ?U)A((a;$gZi50?j99xwCn zi+j>t_N+UEr}M(a2Nxe`UYJ}VpdwQx22#i3(0qi$@<)jyMALtkmnr{W`c7sPP>kI7 zZznSY&|0@Q-#_j;!Tj#!+J8G37y@<#GX=a*6l*@h(p>k3p^OFS?)=`gKk;#~hgcX| zZdAEQLqsZhJ0_wJJ{-T%wRCW;* zI+_={MKlj}USPZx6dV9{SR>G33Zl(NxZoyj{5$!jfLaPkChQeKH34LK+_P?Xmhb6o z|H~fqT>M}5$nd{dZx}EZe|5XP3F-|4MdsuSf})IfCqEN((tOqJ_N+VXNm$Rt7lD63 iZi#!;?e?mZ-MZ{W5%bGGe}S6ZfI41J+Z-#jz7PP-`WagQ delta 563 zcmeC_VCv~$+MvOt%EZIKAPdAEKwJjIJAwEL5Et??FkA#;AwC8M{ms5il|0g~I^AA$ zy1jeB@U!n`H%se*Qs$THjIFmzm|r?ge#ob&@TD*AL3i1sZWh}H#$uy=%naIYZwxPW z9{m2T^%78#@nj`_1CfUe&2=9bO22pB=)8aNLGy9uPPb2!)A()VV_>>150?j69xwCh zi+j>t_G}k3L$?dh_eYcK1XN^d#XyQ!9GZ`CSpFz+gy{Is@-qGZOZUkv0*YY=|LtUE z0NUyH=KIH8Cz#*8-0*J)14F=$V5Wc+P~6 zB)h|ab_b!^eS}{{{+K9|-9WET{0Fz*>)*?_lMf2$FiK5+C!j9&=`X5wh`PxW1x5HZ zMVpUs!S(H$94M$R_7$gc-;*N9%J+g5#y#tHXZfDa_P^{w&&B^`j|~5d^@ahX=2y4d zo1oq>Pz;IfILsc@8}}w)haP*+t$=Q~XNKQiyqx?=(8=^2kkcLZB&_G+i`YLPhr~VV hc6-;!Ze8}Gi1{V!KcFFQKoee1V?Y9%V};fi0svr}1!DjJ diff --git a/exmmtest.exe b/exmmtest.exe index 579751913741cc754bc8e90df4e67901dfa54805..f596c725d37bfe949c8fdc8fd4210cd12ff2367a 100644 GIT binary patch delta 11803 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 delta 11525 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 diff --git a/maptest.exe b/maptest.exe index 6d95e77e771cbd10f2b7ee67031b73afd4e1ce86..f1ae80fd1894215ea7ffb74879d680458e41fc6d 100644 GIT binary patch delta 579 zcmbRAm2uKn#t90%T9yn9y+C{ph+l8iUCb=H)trIh0ucWOVoeJMhI}CI+WeIHpqcc$ zPPZ4GZm(W2{Or5g&C+_Hl=-C=W9#h_=9jLM4_YZIeCmsP&|UVZo5i+)vDj!IGlRC< z8^cST2fu%7y#!QbHkrxVK;#KSbKM7q((j!&I`3b6(0rV^)9uS-H)|WEc$jX>!{x!2 z$IJZt;+}MuJ?jqP>AZ09!Nmuf7bZv8sK{h}1gT?jXgjk_J{MdYirMd16Lm3Ou-TA#~f8yg} z53w+`-Y!c;vOW@MeJG~&3$0b;H+(>{9vA@K|KKig`Sblj3Sdy*r?mS`HNx# zP}xOL=xAQ(7STM^d4cg(P;da)VTM4534CZi!UZ>JP-ITtU@OXack(e?C(T#gZqK^Io`m&W md=dBuB;+}MuJ=?|1(CxzW{n6w&8x@({k03=X4$Vh6EPs?ZLUjCRd71wIrTgS3){0>V z|LtUE0NUyH=KIH8Cz#*8-0*J)14F>(D0 z*4t%CNOp$-?G8e-dx^D*{I(BBb_2aW@gLlJuYWJ!PF`rE!zeZRoQ=BJr@yG$A?hX< z+KTW?erP_z1=qK0vZ1ZI*jJp&eRsY`R=yXkFz#8mJInWUw*O@hdM^Gidt~@utTzl8 zHNU#u-URiAfnrE(hX#94Z`_-J9hca9ZUuC^Jv03F;^pK^woaz+fSm5ICt*DoU&Q_a lIVA2;x7)i;cI&biMa(Z*{{ang1Df!98Uqs8Y-<;40|2$O5WxTd diff --git a/palettec.exe b/palettec.exe index 4576367883ffe4b0f9aca69a2b0cf21dd61dd0a5..47c0141c6b20766babb6634335c95213e15ff6ad 100644 GIT binary patch delta 578 zcmZ3ppK;B8#tjCHs-avA3oKcU8mcN zPPbPt7=HHM>}F{_P|EyLi?Q`~3G++W$%#CQ3ZMGo9(0#I>SnQRU@SJ;$IPJZ_Qvp1 z=fUsaS}y?=nN42AV<7T`p}Fn@L+SU<8=dzrK4?D9-0AjZ@-rSArFfWb%fsctmdDHd z`{JH-mp$ta;px0^@xjFhninSj;8l?k69%bcacDlmVfmxP5u)io%gdDiFMTIB@+wB| z`?r&s0cfq;o9`cYonU_Va_zqz3=9D~7Bd9A*ele0gr&Le4MQ0V(B1jHX@BD5Vh^z} zwB9aDMY28;XniQA^^UwM@-ae4)&m2e`ybo|F8^MBo@~vh!zeO2gHPS|&0iD~fXXg{ zLPzsLw}|GU&I^pUf`S9U4!a0+*dD>=BV2HkHvXNQ$)}b=k_nM$CV(uDd)DpF@;#mH zf7yeci~q|W8U7dR4FksFuWq+DLA_z1$ebL&FUoj#avHyr=BsYEXWd~>!g?;g2>b(b hOWdPww^yC))@3h>m|y<+3)JKW)bV=S=DYmo{Q-V)8e#wd delta 555 zcmZ3ppK;B8#tjCHszF=~47or&1Bj0SF()?zg9;EI1Y$)V28JXcuHPKW_>oKcRj1pF zPPcb27=HHM>}F{_P|EyLow4SnQRU@SJ;$IPJZ_Qvp1 z=fUsaS}y?=8BbosV<7U7p}Fn@L+SU<8=dzrK4?D9-0Ajd@-rSA`52gP%fsaXmdDF{ z`r@8+mp$9X%+T$^^Zn7}f4nL(lENTGEDp^_I4pmZI6`#%XL*_a|E2rn7GA}$ga39i zGXU*$d-MI{t`p4fUT*legMlGn$6|(n7YBrzkFYe?yUMh* z)EfqhA+a5ESc7`w-URIU$J%o%pxf=4;kOqrCl~QMX}$w;y2GA?^;~=r`v>HZxJTV? h?>gD7%U%>QzhwOfG{g;P!s}_11(}66KjA;&4*D;!qa)-;)9D1G%rm4A)q2tE&@`=;?R7A!}3RoBSh1GmX|62U;0jN6i|%Z z_iraN1JGKxH{U<*I>G$z<=THc7#IR}Y-S30At%y&gr&Le4MQ0V(B1jHX@BD5Vh^z} zwB9aDMY28;XniQA^^O86@_U7mtOo`__dmD`T>icMJlR@Mhf!p5hM>Cbo4+U~0F_+? zg^uQhZV}BxofjBy1qBCy9rh6DFj?W|BV2HkHvXNQDX5l0k_o$nP)z_?9`~%_+)*A+l#b4cSZ-RQmK#@5)KuDDF?&LHfC(T#gZqK^Io`m&Wd=dBu j}F{_P|EyLow4SnQRU@SJ;$IPJZ_Qvp1 z=fUsaS}y?=8BbosZy@rJp}Fn@L+SU<8=dzrK4?D9-0Ajd@-u!L`52gP%fsaXmdDF{ z`r@8+mp$9X%+T$^^Zn7}e*!8pRU#loEDp^_I4pmZI6`#%XL*_a|E2rn76HYuga39i zGXU*$d-MI{t`p4fUT*legMlGn$7ZI07m6ayM_8Kc-Y}H003DsvoAxI@F7^-$L+kCb zBqY1TfOZF=+3g~rB7ayI$!?(6C;o$5@AdEH+sTfCI*d}2^90q!KK(`24pBE*P)LMd zO}P087hK=2$rpjjzv5KxdrSyf`ChQXxM$t&EZ@`F{+B)Ix%j{Ak>P)_-Y{U){OWdl z6Vw|9iXpKb92`Ntac=^4m~iym3g~uwX87&J%gIGTPNwgGobIqEVLcaL#Qp&}B<@kS g+q+J7>#`R`%r9C00S$2jn(%rW0}|MLS7>V)04Uf75&!@I diff --git a/scroll.exe b/scroll.exe index de253902ef897ff94f8c41e6ca627f9299d11340..7a3fb30557319bd3de26b1ee0f979e235172e2df 100644 GIT binary patch delta 578 zcmX@Jh55`D<_$i~s#`r67%l+uZy?t6WMIe#;w~W8@?v1<1>$o+{CaaC^Hv|}cb#r8 zI^ABqVEEa0vzw*$Kq>P}EymW{CCo2fCp!ixDtzjTd(d6>sGG&Mfw9^vYrOD;!qa)-;)9D1G%rlP5vU@wnjfT&#i98KhvknFM~J5XEH6|3zx17)7^oPz z@83>l2B5WWZ@z!rb%Ocb%eDV@Ffat{V73o<5yanogr&Le4MQ0V(B1jHX@BD5Vh^z} zwB9aDMY28;XniQA^@@Qi@*nw-tOo`__dmD`T>icMJXtzOhf!p*N07Sho4+U~0F_+? zg^uQhZV}BxofjBy1qBCy9cBo0SRh~X5iYn%8~;xB3{p!W$%J>js3w3ck9*eb&hkB- z?SI*Wo{Rs>9vS`@>kR|O;;(MEH$lB&pvatT5G=}gcd}csljf^#w`bj9Pr`aGz6ksS ia!cH!ZnsyR?AB#3ikM&i`3uzK2GsF-+UC8%{cQk?p&%Uq delta 555 zcmX@Jh55`D<_$i~s+&9*7|sIm4P}b;j1)CCo3KCOZZwDtzgSd(d6>sGG&Mfw9^vYrO49indX#~=~@ zD8A++TyTB6CT|2P|B6$&?=N0t<$J*jjeM~45!dc%NG^Q+tK zO;B$bD2Bv#1n>m)#=QyHQ6<=OE1=u$nc=q=FDC~DJ88ZHa=OEwg!No}5&H+^khn+P iZtptTt;=2%F~4N}2Q<@PU diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index cc5a894c..ca385529 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -350,6 +350,7 @@ byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) } } mmi->EMSmem = (i)*0x4000lu; + printf(" mmi->EMSmem=%lu\n", mmi->EMSmem); return 0; } @@ -595,6 +596,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm) //++++emsver stuff! if(segm>1/*extra>0xfffflu*/) { + scan->blob=segm; /*__asm { push ds @@ -604,7 +606,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm) }*/ -//MML_UseSpace(?segstart?, ?length?, mm); + //MML_UseSpace(segstart, seglength, mm); /*__asm { @@ -1306,7 +1308,8 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm) //modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n"); break; } - end = scan->start+(word)scan->length-1; + for(;scan->length>0xfffflu;scan->length-=0xfffflu); + end = scan->start+(scan->length)-1; //++++ chy = scan->start/320; //++++ chx = scan->start%320; //modexhlin(page, scan->start, (unsigned)end, chy, color); @@ -1315,13 +1318,12 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm) //++++ modexClearRegion(page, chx, chy, 4, 4, color); //} //++++ VW_Hlin(scan->start,(unsigned)end,0,color); -// for(w=0;w>=(word)scan->length/80;w++) -// { -// printf("+ %lu\n", w); - //ultoa (w,str,10); - //strcat (scratch0,str); + for(w=(scan->start)/80;w<=end/80;w++) + { + //printf("+ %u %lu\n", w, scan->length); + //if(w==48) getch(); strcat(scratch0, "+"); -// } + } strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_"); //++++ VW_Plot(scan->start,0,15); //++++ modexClearRegion(page, chx, chy, 4, 4, 15); @@ -1329,14 +1331,15 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm) if(scan->next->start > end+1) { strcat(scratch0, AARESET); - //ultoa (w,str,10); - //strcat (scratch0,str); strcat(scratch0,AAGREEN); -// for(w=(scan->next->start)/80;w>=(word)((scan->length+1)/80);w++) -// { -// printf("0 %lu\n", w); + for(w=(scan->next->start)/80;w<=((scan->length+1)/80);w++) + { + //printf("0 %u %u %lu\n", scan->next->start, w, scan->length); strcat(scratch0,"0"); -// } + } + }else{ + printf("start=%x next=%x end+1=%x\n", scan->start, scan->next->start, end+1); + //getch(); } strcat(scratch0, AARESET); strcat(scratch0,"\n"); @@ -1355,7 +1358,7 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm) ultoa (scan->start,str,16); strcat (scratch,str); strcat (scratch,"\tSize:"); - ultoa ((dword)scan->length,str,10); + ultoa ((word)scan->length,str,10); strcat (scratch,str); strcat (scratch,"\tOwner:0x"); owner = (unsigned)scan->useptr; @@ -1535,7 +1538,7 @@ void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi) printf("UnusedMemory=%lu\n", MM_UnusedMemory(mm)); printf("TotalFree=%lu\n", MM_TotalFree(mm)); //mmi->nearheap+mmi->farheap+ - printf("TotalUsed=%lu\n", mmi->mainmem+mmi->EMSmem+mmi->XMSmem);//+); + printf("TotalUsed=%lu\n", mmi->mainmem+mmi->EMSmem+mmi->XMSmem+mmi->XMSmem); // printf("\n"); // printf("UnusedMemory=%lu kb\n", MM_UnusedMemory()/10248); // printf("TotalFree=%lu kb\n", MM_TotalFree()/10248); diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index e67d2fcf..ab35ce60 100644 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -132,6 +132,7 @@ typedef struct mmblockstruct { //word start,length; word start; dword length; + word blob; //fore data larger than 64k unsigned attributes; memptr *useptr; // pointer to the segment start struct mmblockstruct huge *next; diff --git a/test.exe b/test.exe index e14a2a4441743fd28bced6beb5ede83436f73c42..8a6d833882f2e5a7a12cc36cfc621a857eabdf5f 100644 GIT binary patch delta 578 zcmX?eknzkx#tjCHs-@fv3=@EOHxR!BVtpP41}`9f1;oC*3=Dlhyn1seqacs;yH2+k zoo=sQF#PPh+0D{=pp^Ng7Gvw}66Tk#lN)&z6+ZRFJ?Jib)Xiesz*uawkC{Q+?Tz83 z&V%2-wO#@$GMjve*FfY6Lv!5+hSKkyH#+ZMe9(NHxzp{-WHvq4Wt2+{PPqMm%fu1@+n5{ z`?r&s0cfq;o9`cYonU_Va_zqz3=9D~4l@S4*ele0gr&Le4MQ0V(B1jHX@BD5Vh^z} zwB9aDMY28;XniQA^@)5c@-ae4)&m2e`ybo|F8^MBo*d1u!zePjgJ0eD&0iD~fXXg{ zLPzsLw}|GU&I^pUf`S9U4*Ljn*dD>=BV2HkHvXO5$*-0|k_nM$CV(uDd)DpF@;#mH zf7yeci~q|W8U7dR4FksFuWq+DLA_z1$edgtAj)`ma+`pY=BsYEXWd~>!g?;g2>b(b hOWdPww^yC))@3h>m|y<+3)JKW)bV=S=Dz~x{QC28Jdep1(PiQIJRaRj1pF zPPcb27=HHM>}F{_P|EyLow4SnQRU@SJ;$IPJZ_Qvp1 z=fUsaS}y?=8BadMYasHFp}Fn@L+SU<8=dzrK4?D9-0AjdG8>B%G%j0D} zeQ{5^%bx9GX6Sa|`Tl6K9KVW;q%cSki$n7f4$B`Uju0LHSzf09f9XDX37=xv!GAlM z8Gv@Wz4`ue*9qo#FE{+#!N3r(<1k~uivvQJ0HZxJTV? h?>gD7%U%>QzhwOfG{g;P!s}_11(}66vk0E>2LSkd2QUBt diff --git a/test2.exe b/test2.exe index 618ccf2c43f8e2f070ffc0b516a8a7d45db15874..de349da65c393ae7d913f7de43af40d16dc38212 100644 GIT binary patch delta 578 zcmX?if$`i0#tj!3RkunqFkArQ-$1M>#lVmc#9ctFCC$Ll3&iJu`1R(mj2|VX-*vjZ z=yZGag5hW1&2E;~1EtI_wHRA(moUF{oy;hssPL&T?m>6iqiz=42F7BeeasBnZf^`P zbsqfwt@RR6k=bM?83U0g49#^P7)rl)-srr4@j>%(=1#XSliOr$l;UB!Ef1FmTOKd- z?~8lVUG}Uygs1bu#RnH3XkM5+LsmtG;VnoVi$n7f4$B`Uju1`%Szf06f9X3}QC2Z> z-@l#A3_xq$-hBVK>jd+=muvs+U|iqBP`8zZy3s0fbP!kP5Toc7kh|> zq4joIDw6e)Kt$!$^BJcJF$$DS_bpM09z~$e|&y#P<>M)8-=8#jjee)N^1fa5u zpwQ90&@G~QsPh8jt)Solu)_?24qNuR`3M)>q>XjeM~45!dc%OR_^aFPO;B$bC^9F1kP~IRJDE-1N%K{=+q3SlCt*DoUj+UE ixh3vVx7({ucI&biMa(b%`~_-q1L}A^ZF8;sMGpYkJs-RP delta 563 zcmX?if$`i0#tj!3RX0g8Fq{SAA3&@o#lVmW#4SLqD9ymo2*ihg`2Oavj2|VXUv;{@ z=yZGcg5hW1&2E;~1EtI_)froFmoUF{n#?GpsPLsP?m>6iqiz=42F7BeeasBnZf^`P zbsqfwt@RR6k?~|F83U1r49#^P7)rl)-srr4@j>%(=1#XyliOr$5F^PUG{7jGefrv&-X`@=gF$bFuw&UVsU6b!eRNN#1W$7Kg-MX|1aGqtH>&b9sIYG znE`00+netncb#B<_j1F(9SjTsJD3FmUaWf4e1xUB?hQj33((Oyy=i~q<6;l7Ftpw- zOG2_c3}|-{n%z%iROEf$AlVJ{`ow>5>%IQHd^`D}tPZ2pWIj1{u}^`N?(2`Dd@opG+_P?Xmhb6o|H~fqT>M}5$nd{dZx}FYes#OO z3F-|4#gNzz1-78xxHkbi7P0l*3g~uwX87&J%gI9WPNwgGobIqEVLcaL#Qp&}B<@kS g+q+J7>#`R`%r9C00S$2jn(%rW0}|L=D}T`g04S0TLjV8( diff --git a/tsthimem.exe b/tsthimem.exe index 282bd13ede9bc83446ee5e8bbb9a2071df50eeb4..8a00b50cab11b0320893fc840817776e74a28ef4 100644 GIT binary patch delta 71 zcmcb%it*Yi#tlINJTW<$Niiw;#UN^PoWLX|M%~RHg%&VRUM6NHQe2dbET5X2tCzg_ PwwSC924dB delta 70 zcmcb%it*Yi#tlINJo-7AN%|@I#UN^PoWLX|Mw87Sg%&Ui7bPQ0rRL`9B~R`bv)Ft` OOvZ+B^X8vHu}lD