diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gfxinit.cpp | 54 | ||||
| -rw-r--r-- | src/table/files.h | 6 | ||||
| -rw-r--r-- | src/table/unicode.h | 4 |
3 files changed, 2 insertions, 62 deletions
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index ea6125c70..67b126002 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -30,7 +30,6 @@ struct FileList { MD5File basic[2]; ///< GRF files that always have to be loaded MD5File landscape[3]; ///< Landscape specific grf files MD5File sound; ///< Sound samples - MD5File chars; ///< GRF File with character replacements MD5File openttd; ///< GRF File with OTTD specific graphics }; @@ -192,10 +191,6 @@ void CheckExternalFiles() add_pos += snprintf(add_pos, ERROR_MESSAGE_LENGTH, "Your 'sample.cat' file is corrupted or missing! You can find 'sample.cat' on your Transport Tycoon Deluxe CD-ROM.\n"); } - if (!FileMD5(files->chars)) { - 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 615029b6e..39cecb368 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 e94340d55..01831fa2b 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 */ }; |