From 5e4f4bcdc5a1a3e73acf00f10facc57be87b2800 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 zcmWGwVC3Xr00DLe21Z6kMurFMOiWAL$tSQ%tR7?cCXcE8}90ae@5mP z{tq~rn3*1AJrHJQWM?>0&DgWS|3&XC22LJs1_lOZ1~mx=X$Cb00|sjbcZN`gWQKf( zDuxz@euhRaMra^3aWXRA;9_cKe<8rc%2R1#YHRwi~K9#6i}pGIH$TV`MqO z$H@A?_=FTA%MG3jsyjj$nO=l2wqD3(Ze(D*#=yxh0FDH8IR+&LJqAk#XNCZVIEFli zI)*-mISeZqHZ$yFIK|M!$H>UW3JwFdCSFEHX66?>Of6gw1eutbUWhX_bH9*bWVxZh z*m^^Zk@0~dGb0n{3u#842hxlTH~1MjUYI`MKOn%!-XXxqc0l2R-HXB-b|)$sTOOn? zD0ooC#Mu0x?LiA;+kpiya%317SwX3Tk%0po*9?pdFIX;cyb#1GQNqB;$piKTD>wze zV1B{&fE$#CSs0lvus;xBVqmx-enNc*&jS?@e&N1>XF&)^FyKL`I|Cy-C>b&_uz*tk z3uZ=!7aWXCFPL9&-Qav7c7dOniHYe1=LOXpQp}+IAn}63hLMp^44h<;68;6Y8$1_8 zPDtNSz94XbZ->|m>l=0*VvGzo#8y~75IT{$Kx{|KhSUQM9XcI49T6SNceHhEIMLB@ z>_A7yrv+~(Dqdh}b%;z5xuDdcalv+jM~6s< z#*WGvJsn$a?3H3*WMc;VpM?<|T5KTg3=B6oaLc$eFmkek^)Q39fPBr$%*ep>fb9jx z3m%Z4Z*W`?d%+8e%m4xwP?hBHPj1PnunO=y$U|gM{|eq6VmqX7=$$Y-p})ZX zg6{_Y6Q&(59r+!C9ZfeT&R8&G{ffjJ$1co0adZj;BOezyyjei;`+x=H*$3PwIClu0 z;M*X#L-zsC0rLr#8{AItY=~WvvB7Oe#Ww~`1wg)1lPi(xKFm)=}Oub4J^QyNehY`9S%Qk%1Lt2;&RZ7aR}RKt^5Q z-@$o6Vuiv3gA3{pbPs6kkY1tIA=aUIplF5fie`-P26>l>k>LR+ZW&xL@d6a8%p431 zOiWCSj7$$inHZTKh`kWF!FEGqhw=+GY;nQH1WLnD^a$TzeZjRs4iu+& zBjbkn1L*@C2MlNM-msa$+Y#20+)>a`+u^vOcm{7r?}QZ_7#R6L*$fsa4_IDszTkPm zyMud$*bbo!iVsvDXq+&+VZ4HSht~>|4zUiM9i3RThj4piq3l%)-dP zzyQjq3wS2*-H=(Kcfjm|-42%PFVPs@re8BpG?FA1n10yTQtBeew!V_5)3nL@QD=*j? z86U91$~JH*#K8E1nT6s1|Nk$TFR)oLFmizsA;|d*;N--_^nmpS*9E>C5*tKL2rx4+ zF{v>ya)GR7U|<8;3@W`Yur1&LNg=d@q!<_&Zh(?8(+$=W0x$R(nKp>r;A3QXz@osw z2uf-U%%DJGWPHH_&evSbOiTsSE<_G+oDeu6K7nt8&JE)UIvo}rZVNOn z=-nvSVPIqir8G8B%K}uEF*2OsxWRjZ>wpL&!$Jl|K~RAWDNsN)659=q8(cT|ABY@~ z+#$6<<$~S~n*+QX#BYR55Z~Z+A>@GdhQbvcFQ&aL z$;8NbgYyO31I`<~FN9BsoZ#OfzeE3pMF0aM2gq40$j-XJb3x*TG}vKs3(Pn{t_8PU i7#Rf_7@0w7fSG|4k{}tFnD`hNnLuLf&=LTg0vG_x2a?19 diff --git a/bin/data/openttdd.grf b/bin/data/openttdd.grf index b50c143a55f4c56f7abd609daa77a4407b162701..58be8d92ac1db102521eb418ea67061a5954f0be 100644 GIT binary patch delta 3001 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 diff --git a/bin/data/openttdw.grf b/bin/data/openttdw.grf index 415d4964d34fedcc01e4ebd46382c67082c5385e..268e5df498d2d9eb204cbd905581be2d66f95c7a 100644 GIT binary patch delta 2989 zcmZo^mHanbvY~~sg{g(Pg{6gc3tOF2Js-n=A!Y`~H403OYZMq6*C+%qFmiG*fB-uK z10y3NBf|rBCMKo_oG;j!7#JRKUyyhp$H??R_yXGl{RhT33?CT3uzDfS#Kdrhfsv07 zq>lljosp681@jH=2RtW4R`6cn-@*IBXaVm5#~to7WID7KXmn_GBz4r)Pnfk}n*swP z8w*$`Czu4;dV!sh;Q_}30WOCBLQG7I&ls2(k1;G`;N%ivU|?WnkQHH2VlZH^XYgc* zW=LhoXQ*Z9XJBOp>11r>xxvoJ^n#a(h2wz`OOqfY;|*y><_G+Y%`f;ia4|DZV7Xy> z!|DRp4L8Q-`Uh4_%nTd24%jm_37zm|Wn^b$;XDw}$a15ash#VD&o%~5J_!Z}21W)& z83uI*T?P{dTLxDKKZY2FRE8pkYKCTp9){@*ot$9bzF=c&;dsE!*m{GFoso&1k+GTU zfeZ^fV>9;yK}NP0f)6-Z8QB;+d3KmGF|oeTc)-tC-~EDfgBT;r3p+;M2T?36jLm!x z{27^F_&?xeVrF`f^+1@Jk)7d0HDk{P{};W`!1%$y#CU^Y76T^_HvjF1ZYdzZy z)f?g<*Qhdb?BHW$Il;%s`oQ>v6eG(Go(rlwLKvA|gfO;V$YpM1V7$h_$u9toA$2(h zB?dhPO9p3#0ERe*Jcc@kK886AD;YL3>|;2^(8R~c$i@l|61FB@Mn-1l7d%WYTn_}9 zn3-OPGc|L+kYQxGp}^RBqh5@W@qr>UBNOKfX-1w0(u@o@_!&7~m_Fb?Ai&7pA;8FX zK;eSji^3arCn_0R9;7ZPcu>W}*!-aFK?`Hsfdwye*cko`F)}g*G0HG7vVsy3BLfFG z6)-R|ykNP&@j?)%1W0Q=BLh4@l9zN4*U!-8s!0-Z;lUW%VU+^$9 zf}(mG~KA5IAg(#^(zu@9J?_0#L+1XjC@?+*kA#r zg9j|20C>QCf^&z^3BC<-J9HoL95A0?xxwuO&xY6)85`VoR6w)j1qLR@4-DTJ82JRj z`avbp3+5Z(5PSiO_8r^@L^jBrP@5t6z@o#hL$D*|LQaQLN4-mjQb$@xdB@BdZ4>S; zVqoM0WobqRR*)%-FIZo2JYWNvb%B2e=K+Zo3J(k}s6Ws>ps_=Gg<6MLhvI>v6}~H) z!GXZYRErsDpkQEPWO%@d5or*adWHv_VBHK%wK!w#1ti*CErP)#28W)X_7c>%=w|Mn)k}%7d3Y zAZ<6;Aj%jSALyO1JK%A_Z%4?DScq7M#RRvGq#1P`M>^^+ZMe7M1Go}qWZcETz_^Qn ziE$T$2m>QH?Juz}zF=o$e84Kez{mtDd%;B@10$#i1jjD} zOErTP10xqGHG{mu08VsFOb=LZa9!ZLA+bTE{)7NC0~3=P10xs6b_NDEkmaD#^8(uf z9*`75KS+v!f#C)yLonT7Jt6RdpOI;U$PGS5h6gMP42+-@%D@Z?F-FE0EZ~xZiy9%1S&xp8BTEA;61^0K!lNjjiLU(5F-=ga)yNrjDny_1X6l|YEHHr95=Xb@IMea zAh|q5u@>kWk~I$lhJc#Cl*!wUvRK2YV%2(k!VdVrf> z7x+$yo{-%jd4T_f{sWT-76&+9xEv5ZAiF`}KxT(PN4-HuNJqhr#s#xFHcYqxHEbOr z!%pxY(7(X5!Qq9=42c_&3lbIx9H^XNup(qZ!UUBC6FN3@TmbnE-H<#XQ-4A$iGh&|vNs9ey!V7!B; z!|X+f1p^}oNC~L@2MS40ihjVt$Z&z}1kVk@4O|a2nHU)j7#KNV$qi%{%L`Dm^#Zf9U(+|IxW&Z(eQ8Y81110ypiIWaSE YLQ**clQchars)) { - 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 */ };