From 30bac58bde83b356fbb884033f380881190ef69b Mon Sep 17 00:00:00 2001 From: peter1138 Date: Tue, 22 Jan 2008 08:47:30 +0000 Subject: [PATCH] (svn r11942) -Codechange: Merge chars.grf into openttd[d|w].grf using action 12. Remove obsolete tables used for index mapping. --- bin/data/chars.grf | Bin 2686 -> 0 bytes bin/data/openttdd.grf | Bin 410084 -> 413034 bytes bin/data/openttdw.grf | Bin 410244 -> 413182 bytes src/gfxinit.cpp | 54 ------------------------------------------ src/table/files.h | 6 ++--- src/table/unicode.h | 4 ---- 6 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 bin/data/chars.grf diff --git a/bin/data/chars.grf b/bin/data/chars.grf deleted file mode 100644 index 2b3b6aafc14cc309852450cd79677825675bb950..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2686 zcmai0U2Ggz6+UNXc6MfVcJ{~X-F0^3*iQUI~Nt8hC)^iIG6jynyBbsw>396%XjXfbQdcK|(z68qS?f+6oAa z<&k~wJ@=gRo$q{SE&=);n5PJU^nfZ_mZf}Mv;b5|wAD0PYC^bbRjtcM)Ve;U4_Oxc z5ip8!!?8J;YFn06$Qz@wsHA26Xk5-7PtOm#>}b5ij$HALA#TUD^H zqa?6#;K&p5lnCTD_SGrNh9t<&TDx_=Q@|oRe)a`)L` z@ECjyo`lbl(^ug-^x-zV18?}`R@>UO_B>U>ThgTfiirI{b)6#iOR9#ht|`BOF1`__ zCoHR=mnfp|YCmbBqqnfEKI1spkJLr9^+n}dwxwQF6E+rsU&q_YMg8U-@WT=XW5Yrl zIfgRn~>$-wFtb(J#Ilenh>QL=8ia$dHK`+4-z2pt|_ zL9O!xlyWHM(;flW!&~Aj_D#S)gI}rUMOd6BxL4pLd=xIh=i#ex1HK18f?vR|;J5Gx z*o_d~LXLsETSl~P9a?*Vs!wU6RMI`vB;|E zW;0?-zaqEzHH!Fhd_}!xQI+=99`0wceyIysFzi6^$Q{uUK|8|JwTEteofsVENfdGh zn=+}A;jn|2D5@&)Sho0L8mc4aSD#P9xMvnGsi)2Z77Yz8a18skP3}B`$ku`MbyHMq zx`_K?ULLSbKeV-X1~F=mBh0<#X2K^ee*2y+lW6%(DY)L$p zTwo2hlwKR&X1|udIY9kn=aD#Lv|M9N>3I*|p|pMKcY16Cu*sTe1(tHPr$dvo^h8rr zrPZvOl84cfliJ-PD>t_)k`=iCZTgUSK{jZ>w!o4TvLvR+uufYo4OlfQaqnJkNXw22 zRHQ4Ta@tHga)od3)%dK~Nh%f^ zNmiA(pVoPlOsB_Gn0T`-FJ5AE4Q5eTbw(#-%Q3Pr2qQ(ltM8k7m@GSX9TdrL;3z zU`;lgy*k<%_5TBJ6Rkzc=0AMrVU@^HwTTQ=3xZZnTJ&n_s&wU2dRQ;~w_3PX&KzAX zHjQ-Y^hG>WseNY^31TzKFOYASJ><9@#Jgt-PjS#FJ@HK7HSGb3n$! z8|-)NPsv|Le{TThgaOmwK=sJ`{84KAF_Q}hGGafGwJ2S}t4`n%>QwWC>X0@%@^6QU z4hX^*6;%}#(>(GpW!NI!GQ>3S7}Zh*?dq^ht0q-iB{v^DMTzAI&=66D2ilga5D;M< zYM6W47Vat11w%p;KHW=nB3&!UKt!^gGer#(;-qXLBN`=_sz`~J=6(w zKo)paSI|ltG9r39Gk}I_BnD#@bn?Cqh%-hT2$_Ar`dBaWH)SH+G~^S5DCv?CO|r9W zCtJ>r>#M}e`Z$kpyX)aJq z1~mlk$ubYJ2EtDOYeulgft88Q7f zkv}rCj+jL6{9^OHA|gJ?4<=Jtg|DjPYBTfnxojdkm{hYDSe31@9=np>jPI~yApXx4 zyppYoF!_i+H*CvK$Iryo?Al;$)Qg`P9Ek@kVFGEuVsQ*4(a&TiNpaH>ugfXkg$TG3s;2fh&U$J(~xcG-X@^;0RrcoqAdk6= z%4)`5LHb!G>yj{CpaTXC2kti{8PV8tl`qSBf;V_2J(RBM%}aF7gym38-U~~FqOCi5 nVAJu2pJ$WL6Rc4I4F_zXZxmXmsbEEb^qFG5GRM52Kk4}w%LkIg diff --git a/bin/data/openttdd.grf b/bin/data/openttdd.grf index b50c143a55f4c56f7abd609daa77a4407b162701..58be8d92ac1db102521eb418ea67061a5954f0be 100644 GIT binary patch delta 3001 zcmai0U2Ggz6+ZXQ&+hEb&i;74UdNlnKk*O2vE4c`&QBeph9p$DiO?2NLBX^QqE(@3 z0fp9bw()MvZAoD(Rj@=LEj-YzgkU5_$tV(N9v~Va96=056a!N~v^IiUPe%v4hEt~A;=x;Mvx*k%&xB;R^ho+2RAvXH_0C?$UaO76gq zz{!+xi3NMhFbPX=5o}j#tG!2~5;r77oE- zcnCfMkHV*M-xpyMns6Py1Ft%`voe%TTWOgk*Myx4XetPr8CBCcn^{>Twkk@;B6jeq z8y=z5QgaO~>Kn@OE5uZ5Bq!HQGiZA9JTcUH=}?2pXXTI)q#)iT*ZuSA^#LCLKs*H8 z0LRT@Z3fI$VGL#vk>hX{9)qV4k(Z%`m|V>S16a1PLW8I*ZKhNKkF17COExk*ORw2t zT8!v=rb#;Vh#7mtlFRWP1i|IgVVzJ_C)fBFjjIs+4xD@;p=ov>av0p*`yUF>iME{yonbjR&63SDufL$O);@QxZ z2lPjs_1$h=-@G6nI}0SGHB7Yq94>h8(XoZ#AWj@K~_(T3VR%UbIOP%X1 z5I-N_xk2_|gBnRqW*@~@Xv%_8}uf}-h2oChVjKDUb_-H zVS=F2w1?TK?APL%PEj^i*&6QsG=GjwVjYw0^XxMFZfB?chaY0R?rnl@rwdS)N=sYk zLN9fqYHwUF@mYB&nhVEzGpxcUq8EGXz2<*eU7vi<(9Dg*dizkwMje~5pjnSPe?3e7f{@va? z$v`ILHs-jEwcLg>kVJc+Jq3`%#9AIir|GwcrNPCX!VX9Y8%J{qVMcyXFni^G^m|JG zV=-!p0C#v^78*Q{{b-0OM4+!6a}!3;KDF94klH+@rEKNq@Gj}!#SMet-BqUc0z@Z; z2eb-6sP^8(0wJ-$zNj$qF*GBsW_=XQjB;$CuUaC*JyG?`alt@Y&ETTG*`UkdDs)ed zxa&vn#_LCTVN>A(VZ{ZNC)6(s4@ZYN4n!*y{ig52X5t(fR2o*PVe0D*3)*P_DfP`M z`Nm^$J9Oirw&&N-2#488wjRw#ht*{iHohq7t1k&%6RWb>o!tz2)+7s}bXFvYxB zZqKt-cBVVW7sTaxtV;{j2CPm)7(gRVi(H(E$^`G?^rGY~_yLfj9wL4B!d1!^X^|0m zS&l}-J>3JC>qM0EM?}3n;y=Rc(Q*HU9#h{QWOy6U|2#dTQH4oCItRXraW5W@_xhtz zK36UcI}~KG1D5pYi)gGkttlAgMmwsNLlJ0;fQjjZ0!QuEhtRMDF|ZQ)@dpdg!RU zDsh{;>;ON+mqVAWsQM}p9Gv<}xKwxuI-YA7zp`EY-@s8$E4{2kwTNLp8FVv^lTxy!3+ zEU9&0cV*DYw~&Wh*vYrR0YY>K;rn(_L@l74rtk;8muZ=!zCG+6t+CWVWB4y#{{n#I Begyyk delta 28 gcmaDgOY%vxWJ3#M3sVbo3rh>@7PfniYz$xk0GjUzAOHXW diff --git a/bin/data/openttdw.grf b/bin/data/openttdw.grf index 415d4964d34fedcc01e4ebd46382c67082c5385e..268e5df498d2d9eb204cbd905581be2d66f95c7a 100644 GIT binary patch delta 2989 zcmai0U2Ggz6+Y+A?Ci|$?Cg&>Yddxl=f{qT9NVoE&&qE(@3 z0fjV5rm;8S7E;(s6_^0h!UNq(2u7kxMv*}C0MQlV;fe>iFI4vl-4~>a2jHpU+}Uj+ zQ35yGku&$6bIi+x=yQGATyUxDFm_!$JH zCLJljmL}|gc{lPa z)j?TOM{zyY2blv&DLcZ}8sbC&i|7W~=h0Oc*f&e!V>cj(M(9R_?c=Z;_QF1R2tERj z!Ds2#7vTb|!!`Imyb{p8#xWji`?`!*lt&R15!Xw4+%4jIS=Z4sbsZGY!&ky|KVt`LsZNi}SvnM6O0 z&=nCD^n%z-2!wJnT_qq_@rwMia~beY5L9b<$SVz{oa>NZ}@y5>2L_<_hij^ls@OCkiHE+*O{7+3nH ze%}pi8Y7VH*NF3Bo>(F0yse}zTh_bCWKq|M`D$3~PD8!R{>-r??5^6Er}X2;0E?El z3|!kU#-WRSg3U1{6_}Q+I^;+Ma#C$}YzK`PKM$JG#fM|WsMU`;zdv^%J;J^z#?($( z%c8Vp4yk3{B4}E@1G*ue>9*3RlQY@Ne1`sglE0B&<%!_@cES^2qhC-*@6t}f}wRC|@Qm5!-du_)%c zN92j5D)#dg{yeYqH5I?M(cSoE?+fa-{IU4m>m*?%@_|%J!cDst09_VA+7MB)HQlSj z?1P;H$x#s|PxQW&98JG5Xh}&e`40Sp?CZI`RU%Tq96@8to|dy_GA^bz>UxPU)7?+Y z=lBjDuh8R*{2c$m#?{VWeoFSXrI8fQ24D)t*Piu7`Wa*+y$L-pck8{`bUN0X;w`>C zd$D(-w>~J^#rGG@Cc#KagZCA!zZ28eplTQITeZ9Z4snUX zt!y64iDxQ>+{QGl&5$aXQnJ<7e^9sh;{Pt38rEZ(pFOZqQHM7w{1f~sewJV44<}!x z|GnDjC4`vm-1iXEt_e(NDrvdbN*i*!p48J~Q7!b!>7%`UgxE~_b-kLEd(ToPRJ+&? zm$#{S@7|qX2>s#_?TLS+1l_O`sqx-ywkVg=6?LK$ahhQKD9x{Hoo|U7E@Hzn@2>J# zGv)P<5zMnsSKSW^^}CW-MVLQw`fsQ(E(KuHB&{FG*v|W zb|(NWLrHJ?D(vRUQ6j2Y`5~D4grk720yg^EM9UgpG-h@ZI-Z*jbYw$b3-~!{lN{Ep%r15I48>&$>H$S(Aw&?q zs)$n7M0y$1^kVo1`~`?MT zkDKrH)514_^e?i*nOK+yWPQ-*myE(@U9eRa$$`bfZH zA8+EW&0oY#5Ub;-%yNM$HT%vc`l*6!kchars)) { - add_pos += snprintf(add_pos, ERROR_MESSAGE_LENGTH, "Your '%s' file is corrupted or missing! The file was part of your installation.\n", files->chars.filename); - } - if (!FileMD5(files->openttd)) { add_pos += snprintf(add_pos, ERROR_MESSAGE_LENGTH, "Your '%s' file is corrupted or missing! The file was part of your installation.\n", files->openttd.filename); } @@ -284,53 +279,6 @@ static const SpriteID trg1idx[] = { END }; -/** Replace some letter sprites with some other letters */ -static const SpriteID _chars_grf_indexes[] = { - 134, 134, ///< euro symbol medium size - 582, 582, ///< euro symbol large size - 358, 358, ///< euro symbol tiny - 648, 648, ///< nordic char: æ - 616, 616, ///< nordic char: Æ - 666, 666, ///< nordic char: ø - 634, 634, ///< nordic char: Ø - 382, 383, ///< Œ œ tiny - 158, 159, ///< Œ œ medium - 606, 607, ///< Œ œ large - 360, 360, ///< Š tiny - 362, 362, ///< š tiny - 136, 136, ///< Š medium - 138, 138, ///< š medium - 584, 584, ///< Š large - 586, 586, ///< š large - 626, 626, ///< Ð large - 658, 658, ///< ð large - 374, 374, ///< Ž tiny - 378, 378, ///< ž tiny - 150, 150, ///< Ž medium - 154, 154, ///< ž medium - 598, 598, ///< Ž large - 602, 602, ///< ž large - 640, 640, ///< Þ large - 672, 672, ///< þ large - 380, 380, ///< º tiny - 156, 156, ///< º medium - 604, 604, ///< º large - 317, 320, ///< { | } ~ tiny - 93, 96, ///< { | } ~ medium - 541, 544, ///< { | } ~ large - 585, 585, ///< § large - 587, 587, ///< © large - 592, 592, ///< ® large - 594, 597, ///< ° ± ² ³ large - 633, 633, ///< × large - 665, 665, ///< ÷ large - 377, 377, ///< · small - 153, 153, ///< · medium - 601, 601, ///< · large - END -}; - - static void LoadSpriteTables() { const FileList *files = _use_dos_palette ? &files_dos : &files_win; @@ -362,8 +310,6 @@ static void LoadSpriteTables() ); } - LoadGrfIndexed(files->chars.filename, _chars_grf_indexes, i++); - /* Initialize the unicode to sprite mapping table */ InitializeUnicodeGlyphMap(); diff --git a/src/table/files.h b/src/table/files.h index 615029b6eb..39cecb368f 100644 --- a/src/table/files.h +++ b/src/table/files.h @@ -33,8 +33,7 @@ static FileList files_dos = { { "TRGT.GRF", {0xfc, 0xde, 0x1d, 0x7e, 0x8a, 0x74, 0x19, 0x7d, 0x72, 0xa6, 0x26, 0x95, 0x88, 0x4b, 0x90, 0x9e} } }, { "SAMPLE.CAT", {0x42, 0x2e, 0xa3, 0xdd, 0x07, 0x4d, 0x28, 0x59, 0xbb, 0x51, 0x63, 0x9a, 0x6e, 0x0e, 0x85, 0xda} }, - { "CHARS.GRF", {0x5f, 0x2e, 0xbf, 0x05, 0xb6, 0x12, 0x65, 0x81, 0xd2, 0x10, 0xa9, 0x19, 0x62, 0x41, 0x70, 0x64} }, - { "OPENTTDD.GRF", {0x9a, 0x26, 0xc9, 0xd1, 0xa2, 0x39, 0xb8, 0xaa, 0x57, 0xac, 0x0f, 0xf0, 0xe4, 0x4b, 0x37, 0xb2} } + { "OPENTTDD.GRF", {0xe0, 0x81, 0x09, 0xb3, 0xb0, 0x05, 0xc0, 0xfa, 0xf8, 0x03, 0xb9, 0xed, 0xb5, 0x5d, 0xa5, 0xc7} } }; static FileList files_win = { @@ -47,6 +46,5 @@ static FileList files_win = { { "TRGTR.GRF", {0xde, 0x53, 0x65, 0x05, 0x17, 0xfe, 0x66, 0x1c, 0xea, 0xa3, 0x13, 0x8c, 0x6e, 0xdb, 0x0e, 0xb8} } }, { "SAMPLE.CAT", {0x92, 0x12, 0xe8, 0x1e, 0x72, 0xba, 0xdd, 0x4b, 0xbe, 0x1e, 0xae, 0xae, 0x66, 0x45, 0x8e, 0x10} }, - { "CHARS.GRF", {0x5f, 0x2e, 0xbf, 0x05, 0xb6, 0x12, 0x65, 0x81, 0xd2, 0x10, 0xa9, 0x19, 0x62, 0x41, 0x70, 0x64} }, - { "OPENTTDW.GRF", {0xa1, 0x9c, 0xaa, 0xfc, 0x6b, 0xd2, 0x09, 0xc3, 0xd4, 0x84, 0x33, 0x43, 0x3f, 0xd1, 0xbd, 0xd5} } + { "OPENTTDW.GRF", {0xeb, 0xec, 0x73, 0xe9, 0x47, 0x50, 0xbc, 0xb5, 0x37, 0x1d, 0xf6, 0x5a, 0x26, 0x76, 0x99, 0x83} } }; diff --git a/src/table/unicode.h b/src/table/unicode.h index e94340d553..01831fa2be 100644 --- a/src/table/unicode.h +++ b/src/table/unicode.h @@ -14,8 +14,4 @@ struct DefaultUnicodeMapping { static DefaultUnicodeMapping _default_unicode_map[] = { { 0x010D, 0x63 }, /* Small letter c with caron */ - { 0x0160, 0xA6 }, /* Capital letter s with caron */ - { 0x0161, 0xA8 }, /* Small letter s with caron */ - { 0x017E, 0xB8 }, /* Small letter z with caron */ - { 0x20AC, 0xA4 }, /* Euro symbol */ };