From e4021e90964df22b792d8c51ba7b7ddf68cd72d5 Mon Sep 17 00:00:00 2001 From: XProger Date: Sat, 23 Feb 2019 18:32:39 +0300 Subject: [PATCH] fix Russian characters, fix vault state bug for GYM level --- src/gameflow.h | 2 +- src/glyph_cyr.h | 281 +++++++++++++++++++++++----------------------- src/glyph_cyr.png | Bin 3088 -> 3125 bytes src/lang.h | 10 +- src/lara.h | 20 ++-- src/ui.h | 11 +- 6 files changed, 165 insertions(+), 159 deletions(-) diff --git a/src/gameflow.h b/src/gameflow.h index abf8f2a..9bbc51f 100644 --- a/src/gameflow.h +++ b/src/gameflow.h @@ -729,7 +729,7 @@ namespace TR { LevelID getEndId(Version version) { switch (version & VER_VERSION) { - case VER_TR1 : return LVL_TR1_END2; + case VER_TR1 : return LVL_TR1_10C; case VER_TR2 : return LVL_TR2_HOUSE; case VER_TR3 : return LVL_TR3_CHAMBER; } diff --git a/src/glyph_cyr.h b/src/glyph_cyr.h index 4aae7c2..1694d36 100644 --- a/src/glyph_cyr.h +++ b/src/glyph_cyr.h @@ -1,7 +1,7 @@ #ifndef __GLYPH_CYR__ #define __GLYPH_CYR__ -static unsigned int size_GLYPH_CYR = 3088; +static unsigned int size_GLYPH_CYR = 3125; static unsigned char GLYPH_CYR[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x30, 0x08, 0x03, 0x00, 0x00, 0x00, 0xc9, 0xa1, 0x54, @@ -40,19 +40,19 @@ static unsigned char GLYPH_CYR[] = { 0x34, 0x35, 0x44, 0x30, 0x32, 0x41, 0x33, 0x38, 0x33, 0x36, 0x45, 0x39, 0x31, 0x31, 0x41, 0x46, 0x41, 0x46, 0x45, 0x31, 0x39, 0x34, 0x30, 0x32, 0x31, 0x32, 0x32, 0x37, 0x37, 0x46, 0x22, 0x20, 0x78, 0x6d, 0x70, 0x4d, 0x4d, 0x3a, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, - 0x3d, 0x22, 0x78, 0x6d, 0x70, 0x2e, 0x64, 0x69, 0x64, 0x3a, 0x44, 0x44, 0x39, 0x37, 0x30, 0x39, - 0x39, 0x41, 0x33, 0x37, 0x32, 0x42, 0x31, 0x31, 0x45, 0x39, 0x42, 0x39, 0x35, 0x37, 0x46, 0x32, - 0x33, 0x45, 0x42, 0x36, 0x41, 0x32, 0x42, 0x43, 0x34, 0x42, 0x22, 0x20, 0x78, 0x6d, 0x70, 0x4d, + 0x3d, 0x22, 0x78, 0x6d, 0x70, 0x2e, 0x64, 0x69, 0x64, 0x3a, 0x46, 0x37, 0x44, 0x35, 0x31, 0x30, + 0x41, 0x35, 0x33, 0x37, 0x37, 0x38, 0x31, 0x31, 0x45, 0x39, 0x38, 0x37, 0x37, 0x41, 0x42, 0x43, + 0x34, 0x31, 0x44, 0x45, 0x42, 0x34, 0x38, 0x42, 0x33, 0x39, 0x22, 0x20, 0x78, 0x6d, 0x70, 0x4d, 0x4d, 0x3a, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x44, 0x3d, 0x22, 0x78, 0x6d, - 0x70, 0x2e, 0x69, 0x69, 0x64, 0x3a, 0x44, 0x44, 0x39, 0x37, 0x30, 0x39, 0x39, 0x39, 0x33, 0x37, - 0x32, 0x42, 0x31, 0x31, 0x45, 0x39, 0x42, 0x39, 0x35, 0x37, 0x46, 0x32, 0x33, 0x45, 0x42, 0x36, - 0x41, 0x32, 0x42, 0x43, 0x34, 0x42, 0x22, 0x20, 0x78, 0x6d, 0x70, 0x3a, 0x43, 0x72, 0x65, 0x61, + 0x70, 0x2e, 0x69, 0x69, 0x64, 0x3a, 0x46, 0x37, 0x44, 0x35, 0x31, 0x30, 0x41, 0x34, 0x33, 0x37, + 0x37, 0x38, 0x31, 0x31, 0x45, 0x39, 0x38, 0x37, 0x37, 0x41, 0x42, 0x43, 0x34, 0x31, 0x44, 0x45, + 0x42, 0x34, 0x38, 0x42, 0x33, 0x39, 0x22, 0x20, 0x78, 0x6d, 0x70, 0x3a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x6f, 0x6f, 0x6c, 0x3d, 0x22, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x20, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x20, 0x43, 0x53, 0x36, 0x20, 0x28, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x29, 0x22, 0x3e, 0x20, 0x3c, 0x78, 0x6d, 0x70, 0x4d, 0x4d, 0x3a, 0x44, 0x65, 0x72, 0x69, 0x76, 0x65, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x20, 0x73, 0x74, 0x52, 0x65, 0x66, 0x3a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x44, 0x3d, 0x22, 0x78, 0x6d, - 0x70, 0x2e, 0x69, 0x69, 0x64, 0x3a, 0x42, 0x38, 0x35, 0x32, 0x39, 0x45, 0x42, 0x39, 0x32, 0x34, + 0x70, 0x2e, 0x69, 0x69, 0x64, 0x3a, 0x42, 0x44, 0x35, 0x32, 0x39, 0x45, 0x42, 0x39, 0x32, 0x34, 0x33, 0x37, 0x45, 0x39, 0x31, 0x31, 0x39, 0x31, 0x38, 0x41, 0x43, 0x39, 0x36, 0x38, 0x35, 0x41, 0x34, 0x38, 0x41, 0x42, 0x36, 0x38, 0x22, 0x20, 0x73, 0x74, 0x52, 0x65, 0x66, 0x3a, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x3d, 0x22, 0x78, 0x6d, 0x70, 0x2e, 0x64, 0x69, @@ -62,140 +62,143 @@ static unsigned char GLYPH_CYR[] = { 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x20, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x52, 0x44, 0x46, 0x3e, 0x20, 0x3c, 0x2f, 0x78, 0x3a, 0x78, 0x6d, 0x70, 0x6d, 0x65, 0x74, 0x61, 0x3e, 0x20, 0x3c, 0x3f, 0x78, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x20, 0x65, 0x6e, 0x64, 0x3d, 0x22, - 0x72, 0x22, 0x3f, 0x3e, 0xb8, 0x39, 0x80, 0x02, 0x00, 0x00, 0x00, 0x3f, 0x50, 0x4c, 0x54, 0x45, + 0x72, 0x22, 0x3f, 0x3e, 0xaf, 0xb4, 0x2c, 0x92, 0x00, 0x00, 0x00, 0x3f, 0x50, 0x4c, 0x54, 0x45, 0xce, 0x94, 0x5a, 0xff, 0xef, 0x8c, 0xa5, 0x6b, 0x39, 0xff, 0xff, 0x9c, 0xa5, 0x7b, 0x4a, 0xdc, 0xa0, 0x64, 0x70, 0x5c, 0x2c, 0x30, 0x0c, 0x04, 0xe8, 0xc0, 0x70, 0xff, 0xd6, 0x7b, 0x58, 0x44, - 0x00, 0xc8, 0x90, 0x58, 0xb0, 0x80, 0x50, 0x73, 0x5a, 0x29, 0xb5, 0x84, 0x52, 0x8c, 0x5a, 0x29, - 0xef, 0xc6, 0x73, 0xde, 0xa5, 0x63, 0x31, 0x08, 0x00, 0x5a, 0x42, 0x00, 0xff, 0xff, 0xff, 0x41, - 0x45, 0xe3, 0xb4, 0x00, 0x00, 0x00, 0x15, 0x74, 0x52, 0x4e, 0x53, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0xc8, 0x90, 0x58, 0xb0, 0x80, 0x50, 0x73, 0x5a, 0x29, 0x8c, 0x5a, 0x29, 0xb5, 0x84, 0x52, + 0xef, 0xc6, 0x73, 0xde, 0xa5, 0x63, 0x31, 0x08, 0x00, 0x5a, 0x42, 0x00, 0xff, 0xff, 0xff, 0xed, + 0xab, 0xcf, 0x9c, 0x00, 0x00, 0x00, 0x15, 0x74, 0x52, 0x4e, 0x53, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x2b, 0xd9, 0x7d, 0xea, 0x00, 0x00, 0x07, 0xd4, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, 0xec, 0x9a, - 0x89, 0x72, 0xdb, 0x38, 0x0c, 0x86, 0x29, 0x3a, 0x76, 0x9c, 0x74, 0x79, 0x42, 0xef, 0xff, 0xac, - 0x0b, 0x80, 0x07, 0x00, 0xca, 0x6e, 0xe3, 0x99, 0xad, 0x9b, 0xd9, 0x5a, 0x53, 0xbb, 0xe1, 0x4d, - 0x7c, 0x02, 0x29, 0xfe, 0xb0, 0xdc, 0xfe, 0x97, 0x5f, 0xee, 0x05, 0xe0, 0x9b, 0x5f, 0x89, 0x2e, - 0xe0, 0xaf, 0xaf, 0xd7, 0x1f, 0xd7, 0x57, 0x00, 0x84, 0x79, 0xb5, 0x8c, 0xb0, 0x66, 0xcc, 0x2c, - 0x49, 0xec, 0xfd, 0xd3, 0xb2, 0xc0, 0x4c, 0x6e, 0x8c, 0xac, 0x26, 0x60, 0xa6, 0xb3, 0x4e, 0x4f, - 0xd7, 0xba, 0x51, 0x7d, 0x4f, 0xdb, 0x96, 0x23, 0xf0, 0x97, 0x19, 0x3f, 0xdc, 0x31, 0x98, 0xea, - 0xc3, 0x96, 0x37, 0xfc, 0x94, 0x34, 0x26, 0x7f, 0x00, 0x34, 0xa7, 0x89, 0x00, 0xca, 0x86, 0x4d, - 0xf0, 0xea, 0x03, 0x72, 0x5a, 0x67, 0xec, 0x81, 0x32, 0xb6, 0x32, 0x00, 0xd0, 0x5f, 0x09, 0x0b, - 0xc3, 0x96, 0x39, 0x2b, 0x65, 0xac, 0x5d, 0x26, 0x01, 0x4f, 0x95, 0x3d, 0x65, 0xe7, 0x98, 0x86, - 0x09, 0xd4, 0x5f, 0xf4, 0x52, 0x4e, 0xdd, 0x4b, 0x29, 0xe8, 0xff, 0xf7, 0x54, 0xa8, 0x1c, 0x07, - 0x1c, 0x80, 0xc8, 0x74, 0xfa, 0xea, 0x00, 0x4e, 0x27, 0xd8, 0xe1, 0x74, 0x9a, 0x00, 0x16, 0x83, - 0x77, 0xc8, 0x1e, 0x20, 0x03, 0x6c, 0x9e, 0x1b, 0x04, 0xec, 0xca, 0x00, 0x68, 0xf3, 0x4b, 0x63, - 0x06, 0x0e, 0x6b, 0x60, 0xdf, 0x00, 0x65, 0xd8, 0xeb, 0x5b, 0x7a, 0x66, 0x84, 0x8d, 0xd2, 0x39, - 0x8e, 0x5e, 0x62, 0x06, 0x06, 0x90, 0x1a, 0x21, 0xb4, 0xbf, 0x40, 0xd1, 0x04, 0xda, 0xbd, 0x4a, - 0x45, 0x59, 0x48, 0xed, 0x6d, 0xff, 0x33, 0x0d, 0xa5, 0x03, 0xe8, 0x5d, 0xf8, 0x82, 0x06, 0x65, - 0x07, 0x08, 0xb5, 0x11, 0x9b, 0x00, 0x7a, 0x7d, 0xaa, 0x87, 0xa5, 0x73, 0xbc, 0xc5, 0xe0, 0x99, - 0xce, 0x3d, 0x1d, 0xe6, 0xbd, 0x33, 0xf3, 0xf3, 0x7d, 0x06, 0x0d, 0x00, 0x3b, 0xf2, 0x40, 0xd4, - 0xc7, 0x1a, 0x19, 0x80, 0x00, 0x76, 0x05, 0x00, 0x90, 0x00, 0x1a, 0x3f, 0xaa, 0xa5, 0x42, 0x13, - 0x57, 0x00, 0x5a, 0x01, 0xda, 0xd3, 0xa7, 0xcc, 0x69, 0x98, 0x06, 0x1c, 0xd3, 0x4c, 0x20, 0xa1, - 0xcd, 0xfb, 0xec, 0x2f, 0xbb, 0x66, 0xe8, 0x9c, 0xf0, 0x0a, 0xa0, 0x1c, 0x01, 0xe4, 0x09, 0x20, - 0xb6, 0x74, 0x6f, 0x81, 0xf3, 0x37, 0x00, 0x7a, 0x57, 0xa3, 0x47, 0x06, 0x60, 0xf6, 0x0b, 0x35, - 0x37, 0x03, 0x40, 0x46, 0x8c, 0x19, 0x01, 0x9c, 0x47, 0xff, 0x00, 0xbb, 0x9a, 0x5f, 0x6f, 0x8f, - 0xf6, 0x0f, 0x00, 0xf0, 0x0b, 0x00, 0x68, 0x21, 0xf7, 0xe0, 0xf7, 0xdb, 0x00, 0x9a, 0x07, 0x14, - 0x01, 0xe0, 0x08, 0x40, 0x31, 0xe3, 0x19, 0x83, 0x6f, 0x00, 0xd0, 0xdb, 0xc0, 0x01, 0x00, 0x64, - 0xb5, 0x22, 0xbf, 0x02, 0x80, 0x08, 0xe4, 0xb3, 0xae, 0x94, 0x94, 0x47, 0x72, 0x55, 0xf2, 0xe7, - 0x7b, 0x00, 0xd6, 0x34, 0x1a, 0x47, 0xd3, 0xed, 0x0e, 0x40, 0x00, 0x12, 0x01, 0x48, 0xf7, 0x00, - 0x38, 0x02, 0xe0, 0x1e, 0x02, 0x40, 0xbb, 0x8e, 0xae, 0xcf, 0xbb, 0xa0, 0x02, 0xc0, 0x6b, 0x72, - 0xee, 0x01, 0x73, 0xe6, 0x77, 0x01, 0x90, 0xc1, 0x67, 0x5d, 0x07, 0x3d, 0xd2, 0x78, 0x00, 0x4d, - 0xfe, 0x3e, 0x00, 0x2a, 0x30, 0x83, 0xf8, 0xec, 0xdc, 0x70, 0x00, 0x02, 0x80, 0x0e, 0xe6, 0xc8, - 0x85, 0xee, 0x01, 0xf0, 0xde, 0x3f, 0x02, 0xa0, 0xb0, 0x7d, 0x59, 0xc6, 0xc7, 0x11, 0x70, 0x83, - 0x12, 0x00, 0xa5, 0xad, 0xd9, 0xb1, 0x52, 0x7e, 0x0d, 0x80, 0xec, 0x3f, 0x9f, 0xd3, 0x1d, 0x02, - 0x58, 0xb5, 0x2d, 0x53, 0x35, 0x01, 0xdd, 0xe9, 0x11, 0x00, 0xba, 0xc0, 0x74, 0x00, 0x26, 0x50, - 0xb2, 0x43, 0xf3, 0x61, 0xbf, 0x05, 0x80, 0x08, 0xd0, 0xf5, 0x10, 0x00, 0x6c, 0xa4, 0x00, 0xa0, - 0x07, 0xe0, 0x02, 0x2d, 0x8f, 0x00, 0x00, 0xe3, 0xb2, 0x71, 0x4b, 0x67, 0xdc, 0x03, 0xf4, 0x73, - 0xdc, 0xb8, 0x38, 0x3b, 0xef, 0x03, 0x00, 0x68, 0x07, 0xf4, 0xe6, 0x49, 0x8d, 0x3c, 0x40, 0x36, - 0x49, 0x0b, 0x80, 0x76, 0x1d, 0x70, 0x6f, 0x92, 0xa4, 0x3b, 0xac, 0x3c, 0x2e, 0x2d, 0x69, 0x28, - 0xbc, 0x66, 0x9c, 0x19, 0x9f, 0x28, 0x0b, 0x00, 0xbf, 0x00, 0xf0, 0xc6, 0xbd, 0x73, 0xbf, 0xc6, - 0x0c, 0x12, 0xee, 0x81, 0x08, 0x60, 0x10, 0x68, 0xfb, 0x91, 0x71, 0x71, 0x76, 0x4f, 0x35, 0x01, - 0x0f, 0xba, 0xd3, 0x03, 0x10, 0x90, 0x47, 0x80, 0x00, 0xd1, 0xfe, 0x41, 0x6b, 0xb6, 0x44, 0x50, - 0x55, 0x34, 0x80, 0xd5, 0x60, 0x5f, 0x62, 0xc4, 0xdb, 0x1b, 0x47, 0x0b, 0x7e, 0x62, 0x18, 0x00, - 0xfe, 0x00, 0x00, 0x07, 0xc0, 0xfa, 0xf5, 0x0e, 0x80, 0x52, 0xe9, 0x9a, 0x33, 0x8e, 0xfd, 0x0c, - 0x90, 0xb6, 0x48, 0xc9, 0x1a, 0xc9, 0xe5, 0x70, 0x09, 0x54, 0x35, 0x80, 0xf2, 0x00, 0x6c, 0xff, - 0x73, 0x00, 0xd5, 0xc1, 0x62, 0xff, 0x0a, 0xa0, 0x5d, 0xda, 0x65, 0xe0, 0x4d, 0x00, 0x88, 0xc1, - 0xed, 0x86, 0xc4, 0x52, 0x4c, 0x0b, 0x5a, 0xfe, 0xda, 0x65, 0xd8, 0x5e, 0xe7, 0x86, 0x4f, 0x39, - 0x18, 0xb5, 0x87, 0xfd, 0xd4, 0x81, 0x1e, 0xab, 0x1f, 0x13, 0xc6, 0x04, 0x02, 0xed, 0x7f, 0x04, - 0x00, 0x3b, 0x0e, 0x9d, 0x40, 0x96, 0xe6, 0xa3, 0x3d, 0x8c, 0x09, 0x74, 0x07, 0x90, 0xa7, 0x62, - 0xa4, 0x3f, 0xa3, 0x18, 0x54, 0xf5, 0x82, 0x1e, 0xcc, 0xd5, 0x14, 0x18, 0x7f, 0xc5, 0x16, 0xe9, - 0x26, 0x80, 0xd5, 0xe0, 0x3a, 0xae, 0xde, 0x02, 0xde, 0x78, 0xcb, 0x78, 0xab, 0x6a, 0x0f, 0x74, - 0x64, 0x7f, 0xaf, 0xef, 0x5a, 0x65, 0xfc, 0xe8, 0xf1, 0xd4, 0x84, 0x6a, 0x2b, 0xaa, 0xa3, 0x46, - 0xa0, 0x3f, 0xfa, 0x27, 0xa8, 0x19, 0xee, 0xb6, 0x3d, 0x1f, 0x26, 0xfb, 0x84, 0x4c, 0xa7, 0x55, - 0x66, 0x28, 0x2d, 0xac, 0x3e, 0xb1, 0x1d, 0x9a, 0x69, 0x0c, 0x2b, 0xec, 0x7c, 0x61, 0x74, 0x69, - 0x30, 0x02, 0x1f, 0xe5, 0xd6, 0xa2, 0x5a, 0xed, 0x0c, 0x5e, 0x72, 0xf8, 0x05, 0xe0, 0x3f, 0x93, - 0xed, 0x0f, 0x08, 0xfc, 0xef, 0x04, 0x60, 0x91, 0xcb, 0x4a, 0xd1, 0xab, 0x94, 0xb5, 0x6f, 0x8d, - 0x37, 0xd0, 0x53, 0x44, 0xd4, 0xf3, 0xaf, 0xec, 0x27, 0xb1, 0x9b, 0xfc, 0x37, 0x02, 0x20, 0xd2, - 0x7a, 0x3c, 0x83, 0x48, 0xae, 0xcf, 0x3d, 0x97, 0xf4, 0x73, 0x62, 0xcd, 0x6b, 0x4c, 0x50, 0xf2, - 0x81, 0x1b, 0x00, 0x7c, 0x2d, 0x60, 0xb3, 0xf3, 0x21, 0x6d, 0xcb, 0xe9, 0xfb, 0x00, 0xc8, 0x65, - 0x51, 0x8b, 0x1b, 0x3e, 0xf8, 0x95, 0xc0, 0xa7, 0xa3, 0x28, 0xe6, 0x4d, 0x24, 0x69, 0x23, 0x6b, - 0x41, 0xdb, 0x1f, 0xbf, 0x6a, 0x7d, 0x3b, 0xf7, 0xe0, 0xa3, 0xeb, 0x8f, 0x12, 0x30, 0x4e, 0x7f, - 0x03, 0x00, 0x59, 0xaa, 0x04, 0x37, 0x03, 0x28, 0x92, 0x91, 0x38, 0x80, 0x21, 0x47, 0xbf, 0xb4, - 0x45, 0x78, 0x74, 0x0a, 0x48, 0xe0, 0xcf, 0x01, 0x08, 0x14, 0x4f, 0x0a, 0x06, 0x80, 0x91, 0xcb, - 0x29, 0xe9, 0x00, 0x0d, 0x03, 0xe0, 0x93, 0xcd, 0x70, 0x81, 0x94, 0x0d, 0x00, 0xd2, 0xef, 0xa0, - 0x16, 0xc0, 0x12, 0x4f, 0xdc, 0xd7, 0x00, 0x63, 0x3b, 0xcb, 0xc3, 0x88, 0x17, 0x71, 0x78, 0xf1, - 0x72, 0xb9, 0xf0, 0x47, 0xb5, 0x58, 0x6e, 0x97, 0xd7, 0xa7, 0x53, 0xca, 0x92, 0x11, 0x7b, 0xdd, - 0x19, 0xb3, 0x44, 0xad, 0xd8, 0xbe, 0xfa, 0x68, 0x6d, 0x78, 0xa9, 0x0f, 0x1b, 0x9e, 0x83, 0x4e, - 0xf3, 0xfe, 0x22, 0x80, 0x7c, 0x3a, 0x9d, 0x32, 0xac, 0xdb, 0xe0, 0x04, 0x00, 0x1d, 0x40, 0x99, - 0x00, 0x32, 0x85, 0x41, 0x35, 0x80, 0xa2, 0xc4, 0x20, 0xee, 0x29, 0xa6, 0x3f, 0xec, 0x9f, 0x06, - 0x08, 0x4a, 0x5c, 0x91, 0xd2, 0x9d, 0x00, 0xde, 0xb7, 0xeb, 0xe5, 0x82, 0xff, 0xb6, 0xeb, 0xfb, - 0x28, 0xc7, 0xeb, 0x43, 0xda, 0x9f, 0xd0, 0xe3, 0xfc, 0x49, 0x1d, 0x4e, 0xc3, 0xb6, 0x95, 0x8f, - 0x8f, 0x31, 0x42, 0x68, 0x21, 0xbf, 0x30, 0xe2, 0x3e, 0x1c, 0x33, 0xe4, 0x2f, 0xd5, 0x5d, 0x29, - 0xb3, 0x3e, 0xe0, 0x0a, 0x77, 0xbe, 0x4e, 0x79, 0xec, 0x82, 0x73, 0x46, 0x2e, 0x77, 0x1b, 0xb3, - 0x02, 0x30, 0xce, 0xb6, 0xa0, 0x4a, 0xb3, 0xa8, 0xcd, 0x42, 0x7b, 0xc6, 0x3c, 0xd9, 0x06, 0x8a, - 0x05, 0x80, 0x9f, 0xfd, 0x85, 0x52, 0xde, 0x42, 0x7d, 0x0b, 0x62, 0xbf, 0xad, 0xbf, 0xbf, 0x9f, - 0xaf, 0x08, 0xe0, 0x7a, 0x9e, 0xf6, 0x67, 0x3c, 0xa3, 0x89, 0xde, 0xa7, 0xa9, 0x19, 0xfb, 0xd1, - 0x56, 0x92, 0x26, 0x13, 0x40, 0xa6, 0x23, 0x79, 0xd8, 0x3e, 0x72, 0x98, 0xf5, 0x69, 0x50, 0x25, - 0x3d, 0xaa, 0xae, 0x0f, 0xd8, 0xbd, 0xf7, 0x15, 0xff, 0x53, 0x00, 0xb4, 0x5c, 0x66, 0x13, 0x39, - 0x42, 0x72, 0xf0, 0x00, 0x11, 0xa8, 0x58, 0xa8, 0x00, 0xd0, 0x59, 0x57, 0x00, 0x60, 0x7f, 0xd5, - 0x02, 0xe0, 0xb3, 0xb0, 0x02, 0xc0, 0xf5, 0xcb, 0xcc, 0x41, 0x02, 0xd7, 0x69, 0x3f, 0x9d, 0x72, - 0x71, 0x91, 0x28, 0xf1, 0x96, 0x4b, 0x36, 0xf6, 0xe3, 0x06, 0x52, 0xa9, 0xbd, 0x84, 0xc8, 0x62, - 0xc6, 0xfb, 0x2f, 0x00, 0x8a, 0xf7, 0x0b, 0x80, 0xdd, 0xd4, 0x47, 0x00, 0x51, 0x03, 0x58, 0xe4, - 0x72, 0xdf, 0x03, 0xc4, 0x5e, 0xec, 0x61, 0x01, 0x40, 0x70, 0x26, 0x80, 0x6a, 0xd5, 0xff, 0x4e, - 0xfd, 0x79, 0xb5, 0x64, 0x31, 0x5d, 0x17, 0xa5, 0x03, 0x63, 0x5a, 0xed, 0xfa, 0xbc, 0x9e, 0xaf, - 0xe7, 0xf3, 0xa7, 0x0e, 0xaf, 0xe8, 0x78, 0x47, 0x71, 0x3e, 0x67, 0x7d, 0x6e, 0x00, 0xb7, 0x00, - 0x00, 0x12, 0xa4, 0x1f, 0x7d, 0x2f, 0xa7, 0xf5, 0x78, 0x3a, 0x69, 0x00, 0xce, 0x02, 0xf0, 0xae, - 0x46, 0x47, 0xab, 0xa0, 0x03, 0x60, 0xc3, 0x34, 0x80, 0xd2, 0x9e, 0x02, 0xaa, 0x87, 0xd4, 0xd6, - 0xb9, 0x64, 0x64, 0x1d, 0x22, 0x82, 0x56, 0x5f, 0xd4, 0x74, 0x41, 0x0f, 0x10, 0x8f, 0x42, 0x8f, - 0xb8, 0x01, 0x20, 0xc9, 0x3d, 0xfd, 0xbc, 0xfe, 0xc0, 0x25, 0x30, 0x09, 0xd0, 0x9e, 0x87, 0x4b, - 0x40, 0xc9, 0x77, 0x5c, 0xa2, 0xa5, 0x78, 0xd9, 0xc3, 0x19, 0xc0, 0x94, 0xb7, 0x08, 0x00, 0x85, - 0x1f, 0xd4, 0xe1, 0xb1, 0xa8, 0xfe, 0xc8, 0xe3, 0xd5, 0x6c, 0xd9, 0xe3, 0x44, 0x0e, 0x57, 0x4f, - 0xea, 0x70, 0xd8, 0x8f, 0x00, 0x22, 0xed, 0x01, 0x4e, 0xe4, 0x7a, 0xe4, 0x80, 0x9e, 0x8d, 0xe1, - 0x61, 0x9e, 0x32, 0x98, 0xec, 0x17, 0x00, 0x15, 0x09, 0x50, 0xde, 0x94, 0xd3, 0xb6, 0xbf, 0x03, - 0x00, 0x22, 0x80, 0xf6, 0x8f, 0xcc, 0xcf, 0xed, 0xc7, 0xe5, 0x72, 0xc6, 0x7f, 0xdb, 0x67, 0x6f, - 0x4f, 0x01, 0xa8, 0xa8, 0xc2, 0x05, 0xed, 0x86, 0xfb, 0xd9, 0x1f, 0x79, 0xaf, 0x18, 0x54, 0x11, - 0xc0, 0x0e, 0x72, 0x8b, 0x51, 0x29, 0x53, 0xb1, 0x9a, 0x7e, 0xb6, 0x00, 0x68, 0xc2, 0x51, 0x96, - 0xa4, 0xc3, 0x05, 0x41, 0x40, 0x64, 0x91, 0xa1, 0xbe, 0x2f, 0x8b, 0xbe, 0x07, 0x8a, 0x7a, 0xcc, - 0x3b, 0xdc, 0x7f, 0x99, 0x50, 0x04, 0x68, 0x5b, 0x9f, 0xf2, 0x74, 0xe9, 0x0f, 0xf7, 0x33, 0xab, - 0x6c, 0x2b, 0x39, 0x29, 0xc8, 0x02, 0xf8, 0x07, 0x1f, 0x81, 0x67, 0xfa, 0x7c, 0xce, 0x06, 0x3a, - 0xfa, 0x41, 0xfe, 0x4a, 0x2e, 0x3c, 0x30, 0x52, 0x48, 0x10, 0x2d, 0x9c, 0x01, 0x81, 0x1a, 0x79, - 0x66, 0x75, 0x20, 0xe3, 0x50, 0x01, 0x44, 0x99, 0x3f, 0xdf, 0x80, 0xaa, 0x22, 0x28, 0x66, 0xfd, - 0xf5, 0x78, 0x80, 0x51, 0xd2, 0x37, 0xf4, 0xf3, 0xbe, 0xc4, 0x0b, 0xf6, 0x55, 0xd0, 0x1f, 0xf4, - 0xf6, 0x1d, 0x21, 0x7f, 0xa8, 0xbe, 0xbf, 0xbf, 0xbf, 0xcf, 0xcf, 0xad, 0x72, 0x89, 0x47, 0xe8, - 0x74, 0x5d, 0xd2, 0x92, 0x31, 0xa7, 0xb7, 0xdf, 0xae, 0x6f, 0xa3, 0x09, 0x2f, 0x39, 0xfc, 0x02, - 0xf0, 0x02, 0xf0, 0x02, 0xf0, 0x02, 0xf0, 0x97, 0x03, 0x58, 0x5f, 0x39, 0xf9, 0x42, 0x34, 0x61, - 0x7e, 0xfe, 0x17, 0x00, 0xfa, 0x8f, 0xb7, 0x79, 0x98, 0xb3, 0xea, 0xe9, 0xd5, 0xe0, 0xf0, 0x11, - 0x6b, 0xd8, 0xf0, 0xe8, 0x39, 0xe4, 0xe7, 0x02, 0xaf, 0x27, 0x67, 0xee, 0x91, 0xed, 0x2d, 0xbd, - 0xaf, 0xf3, 0xd6, 0xf8, 0xc1, 0xef, 0x06, 0x40, 0x01, 0x9d, 0x2a, 0x11, 0xb0, 0x55, 0x4f, 0xaf, - 0x06, 0x63, 0xfd, 0x1a, 0x8a, 0x02, 0x70, 0xb2, 0x41, 0xc5, 0x1e, 0x63, 0x9c, 0x3d, 0x1c, 0x62, - 0x8e, 0x7e, 0xd5, 0xfb, 0x34, 0x5e, 0xc6, 0xbc, 0x2e, 0x99, 0xb9, 0x7c, 0x09, 0x50, 0x3c, 0xc1, - 0x03, 0x9c, 0xd6, 0xdf, 0x46, 0x4f, 0x2f, 0x06, 0x1f, 0x00, 0x00, 0x87, 0x94, 0xb4, 0xd8, 0x61, - 0x87, 0x99, 0xe2, 0xc4, 0x16, 0x1f, 0xf4, 0x3e, 0x55, 0x0c, 0x8e, 0xc2, 0x8c, 0x99, 0x4f, 0xab, - 0x58, 0x1e, 0xb4, 0x18, 0x7a, 0x02, 0x00, 0xb7, 0x00, 0x58, 0xf4, 0xf4, 0x5d, 0x00, 0xf2, 0xc6, - 0x82, 0x8e, 0x00, 0xf5, 0xe4, 0xec, 0x61, 0x29, 0x3e, 0xe8, 0x7d, 0xaa, 0xd8, 0xde, 0xfa, 0x68, - 0x73, 0xa0, 0xd5, 0xf8, 0x5c, 0x00, 0x24, 0x3c, 0xea, 0x36, 0x25, 0x1b, 0xf8, 0x45, 0x4f, 0x2f, - 0x06, 0x8f, 0xb4, 0x8a, 0x80, 0x50, 0x7c, 0x45, 0xc9, 0xdf, 0x96, 0x1c, 0x3d, 0x2c, 0xc5, 0x43, - 0xef, 0x3b, 0xfd, 0xc2, 0x46, 0xe1, 0x98, 0x44, 0x6e, 0xaa, 0x09, 0x5c, 0x0c, 0xf0, 0x64, 0x00, - 0x24, 0x6e, 0xab, 0xfc, 0x5e, 0x0f, 0x46, 0x4f, 0x2f, 0x06, 0xf3, 0x0b, 0x18, 0xfc, 0x73, 0x7c, - 0x9d, 0xbf, 0xff, 0xe3, 0x1d, 0x53, 0x2f, 0x60, 0xb4, 0xe4, 0xf4, 0x00, 0x5b, 0xcc, 0x2f, 0x55, - 0x59, 0xbd, 0x4f, 0x9d, 0x35, 0x0f, 0xa8, 0x43, 0xac, 0xc5, 0x45, 0x43, 0xff, 0x4e, 0x00, 0x28, - 0x34, 0x51, 0x9e, 0xe6, 0x18, 0x8d, 0x20, 0x74, 0xe6, 0x9d, 0x26, 0xfd, 0xfe, 0x41, 0xcd, 0xfd, - 0xb7, 0xe8, 0xd1, 0x02, 0x22, 0xde, 0x62, 0x1d, 0x4f, 0xe0, 0xe4, 0xec, 0x61, 0x29, 0xee, 0xaf, - 0xec, 0x44, 0xf5, 0xc6, 0x0b, 0x8a, 0x73, 0x0a, 0x7a, 0x40, 0x69, 0x3f, 0x61, 0x73, 0x50, 0xd1, - 0xc5, 0xe7, 0x01, 0x68, 0xca, 0x16, 0xcc, 0x88, 0x4a, 0x4f, 0x8b, 0xc1, 0x55, 0xcb, 0x5d, 0xfa, - 0xfd, 0xbd, 0x4a, 0x00, 0xc0, 0x8b, 0x1c, 0x6e, 0xc9, 0xd9, 0xc3, 0x52, 0x7c, 0xd0, 0xfb, 0x5c, - 0x91, 0xef, 0xc2, 0xb0, 0x9f, 0x02, 0x1c, 0x31, 0x3e, 0x6d, 0x09, 0x88, 0x6c, 0x5e, 0x24, 0xbb, - 0xd5, 0xf7, 0x37, 0x65, 0xfd, 0x8d, 0xf0, 0xc1, 0x48, 0xd6, 0x3b, 0xc5, 0x77, 0xf4, 0x7e, 0xd5, - 0xef, 0x1f, 0x50, 0xd0, 0xa4, 0x3e, 0xcb, 0x03, 0xfe, 0x15, 0x60, 0x00, 0x44, 0xbe, 0x69, 0xfa, - 0x76, 0xae, 0xa1, 0x59, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0x2b, 0xd9, 0x7d, 0xea, 0x00, 0x00, 0x07, 0xf9, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, 0xec, 0x9a, + 0x8b, 0x72, 0xe3, 0x2a, 0x0c, 0x86, 0x31, 0x69, 0xd2, 0xb4, 0x7b, 0xb8, 0xca, 0xef, 0xff, 0xac, + 0x47, 0x12, 0x20, 0x24, 0x9c, 0x6c, 0x9b, 0x99, 0x76, 0xa6, 0x3b, 0x8d, 0xa7, 0xc9, 0x2e, 0xe6, + 0x26, 0x7d, 0x96, 0x31, 0xbf, 0x62, 0xb7, 0xff, 0xf2, 0xc3, 0x3d, 0x01, 0xfc, 0xf0, 0x23, 0xd2, + 0x01, 0xfc, 0xf5, 0xf9, 0xf6, 0xe3, 0xf8, 0x0c, 0x80, 0x20, 0x47, 0x3b, 0x11, 0xd6, 0x13, 0x72, + 0x6a, 0x16, 0xf6, 0xfe, 0x69, 0xa7, 0xc0, 0x18, 0x37, 0x66, 0x56, 0x06, 0x18, 0x73, 0x56, 0xf3, + 0x74, 0xab, 0x1b, 0xcd, 0xf7, 0xb8, 0x6d, 0x39, 0x01, 0x7f, 0x99, 0xf9, 0xc3, 0x1d, 0x87, 0xa9, + 0x3d, 0x6c, 0x79, 0xc3, 0x4f, 0x89, 0xc3, 0xf8, 0x03, 0x20, 0x31, 0x13, 0x01, 0x94, 0x0d, 0xbb, + 0xe0, 0xd1, 0x27, 0xe4, 0xb2, 0x3e, 0xb1, 0x07, 0x3a, 0xb1, 0x95, 0x01, 0x80, 0xfe, 0x17, 0xb1, + 0x32, 0x6c, 0x99, 0x4f, 0xc5, 0x8c, 0xad, 0x8b, 0x10, 0xf0, 0xd4, 0xd8, 0xd3, 0xe9, 0x9c, 0xe2, + 0x70, 0x81, 0xc6, 0x4b, 0x7e, 0xd6, 0xd3, 0xf0, 0xb3, 0x16, 0xf4, 0xbf, 0x7b, 0x2c, 0x54, 0x8f, + 0x13, 0x0e, 0x40, 0xe4, 0x3a, 0x7d, 0x75, 0x00, 0xa7, 0x13, 0xec, 0x70, 0x3a, 0x09, 0x80, 0xc5, + 0xe1, 0x1d, 0xb2, 0x07, 0xc8, 0x00, 0x9b, 0xe7, 0x0e, 0x01, 0x87, 0x32, 0x00, 0x9a, 0x7d, 0x71, + 0x58, 0xe0, 0xb0, 0x05, 0x8e, 0x0d, 0x50, 0x86, 0xbf, 0xbe, 0x95, 0xe5, 0x44, 0xd8, 0xa8, 0x9c, + 0xd3, 0x18, 0x25, 0x65, 0x60, 0x00, 0xb1, 0x11, 0x42, 0xff, 0x0b, 0x14, 0x4d, 0xa0, 0x5d, 0xab, + 0x58, 0x94, 0x87, 0xd4, 0xdf, 0x8e, 0x2f, 0x65, 0x28, 0x1d, 0x40, 0x1f, 0xc2, 0x17, 0x74, 0x28, + 0x3b, 0x40, 0xa8, 0x8d, 0x98, 0x00, 0xe8, 0xed, 0xa9, 0x1d, 0xd6, 0xca, 0x7c, 0x8b, 0xc3, 0x52, + 0xce, 0xbd, 0x1c, 0xe4, 0xda, 0x19, 0xfb, 0x7c, 0xb7, 0xa0, 0x01, 0xe0, 0x40, 0x1e, 0x88, 0xfa, + 0x5c, 0xe3, 0x04, 0x20, 0x80, 0x5d, 0x01, 0x00, 0x24, 0x80, 0xce, 0x8f, 0x66, 0xb1, 0x90, 0xe1, + 0x0a, 0x40, 0xab, 0x40, 0x7f, 0xba, 0xc9, 0x5c, 0x06, 0x71, 0xe0, 0x58, 0x66, 0x02, 0x11, 0x7d, + 0xde, 0x65, 0xbc, 0xec, 0x9a, 0xa3, 0x62, 0xf0, 0x0a, 0xa0, 0x1c, 0x01, 0x64, 0x01, 0x90, 0x5a, + 0xb9, 0xf7, 0x40, 0xfb, 0x0d, 0x80, 0x3e, 0xd4, 0x18, 0x91, 0x01, 0x98, 0xf5, 0x42, 0xd9, 0x66, + 0x00, 0xcc, 0x19, 0x53, 0x46, 0x00, 0xe7, 0x31, 0x3e, 0xc0, 0xae, 0xec, 0xeb, 0xfd, 0xd1, 0xff, + 0x01, 0x00, 0x3e, 0x00, 0x80, 0x1e, 0xf2, 0x08, 0x7e, 0xbf, 0x0d, 0xa0, 0x45, 0x40, 0x99, 0x00, + 0x1c, 0x01, 0x28, 0x66, 0x3e, 0xe3, 0xf0, 0x0d, 0x00, 0x7a, 0x19, 0x38, 0x00, 0x80, 0xac, 0xee, + 0xc8, 0xcf, 0x00, 0x20, 0x02, 0xf9, 0xac, 0x1b, 0x45, 0x15, 0x91, 0xdc, 0x94, 0xe2, 0xf9, 0x1e, + 0x80, 0xb5, 0x8c, 0xce, 0x91, 0xb9, 0x3d, 0x00, 0x08, 0x40, 0x24, 0x00, 0xf1, 0x1e, 0x00, 0x47, + 0x00, 0xdc, 0x43, 0x00, 0x68, 0xd5, 0xd1, 0xed, 0x79, 0x15, 0x54, 0x00, 0xf8, 0x9e, 0x94, 0x35, + 0x40, 0x2c, 0xbf, 0x0b, 0x80, 0x1c, 0x3e, 0xeb, 0x36, 0x18, 0x91, 0x26, 0x02, 0xc8, 0xf8, 0xfb, + 0x00, 0xa8, 0xc2, 0x4c, 0xe2, 0xb3, 0x73, 0x23, 0x00, 0x08, 0x00, 0x06, 0x98, 0xa3, 0x10, 0xba, + 0x07, 0xc0, 0x7b, 0xff, 0x08, 0x80, 0xc2, 0xfe, 0xe5, 0x39, 0x3f, 0xce, 0x80, 0x0b, 0xd4, 0x04, + 0x50, 0xda, 0x3d, 0x3b, 0xee, 0x94, 0x8f, 0x01, 0x90, 0xff, 0xe7, 0x73, 0xbc, 0x43, 0x00, 0x9b, + 0xb6, 0xdb, 0x54, 0x19, 0xa0, 0x07, 0x3d, 0x02, 0xc0, 0x10, 0x90, 0x00, 0x60, 0x02, 0x25, 0x3b, + 0x74, 0x1f, 0xf6, 0x5b, 0x00, 0x88, 0x00, 0x1d, 0x0f, 0x01, 0xc0, 0x4e, 0x0a, 0x00, 0x46, 0x00, + 0xde, 0xa0, 0xe5, 0x11, 0x00, 0x60, 0x42, 0x36, 0x6d, 0xf1, 0x8c, 0x6b, 0x80, 0x7e, 0x8e, 0x9b, + 0x10, 0xe7, 0xe0, 0x7d, 0x00, 0x00, 0xad, 0x80, 0xde, 0x3c, 0xa9, 0x91, 0x07, 0xcc, 0x45, 0xd2, + 0x02, 0xa0, 0x55, 0x07, 0xdc, 0xcb, 0x2c, 0xd2, 0x15, 0x56, 0x11, 0x17, 0x97, 0x32, 0x14, 0xbe, + 0x67, 0x9c, 0x99, 0x9f, 0x28, 0x4f, 0x00, 0x7e, 0x01, 0xe0, 0x4d, 0x78, 0xe7, 0x7e, 0x0c, 0x0b, + 0x22, 0xae, 0x81, 0x08, 0x60, 0x10, 0x68, 0xeb, 0x91, 0x09, 0x71, 0x0e, 0x4f, 0x65, 0x80, 0x07, + 0x3d, 0xe8, 0x01, 0x08, 0xcc, 0x47, 0xc0, 0x04, 0xa2, 0xe3, 0x83, 0xee, 0xd9, 0x92, 0x40, 0x35, + 0xd1, 0x00, 0x56, 0x87, 0x7d, 0x49, 0x09, 0x2f, 0x6f, 0x1a, 0x3d, 0xf8, 0x89, 0x61, 0x00, 0xf8, + 0x03, 0x00, 0x9c, 0x00, 0xdb, 0xd7, 0x3b, 0x00, 0x4a, 0xa5, 0x43, 0x2c, 0x4e, 0x7d, 0x0f, 0x10, + 0xb7, 0x44, 0xc5, 0x9a, 0x28, 0xe4, 0xf0, 0x16, 0xa8, 0x6a, 0x02, 0x15, 0x01, 0xd8, 0xff, 0xef, + 0x00, 0xaa, 0x83, 0xc5, 0xff, 0x15, 0x40, 0x3b, 0x74, 0xc8, 0xc0, 0xcb, 0x04, 0x30, 0x1d, 0x6e, + 0x17, 0x24, 0x95, 0x62, 0x7a, 0xd0, 0xed, 0xaf, 0x43, 0x86, 0xfd, 0x75, 0x6e, 0xc4, 0x94, 0x83, + 0xd1, 0x7a, 0xf8, 0x4f, 0x03, 0xe8, 0xb9, 0xfa, 0x36, 0x61, 0x18, 0x10, 0x68, 0xfd, 0x23, 0x00, + 0x38, 0x70, 0xe8, 0x04, 0xf2, 0xec, 0x3e, 0xfa, 0xc3, 0x30, 0xa0, 0x07, 0xc0, 0x7c, 0x2a, 0x26, + 0xfa, 0x6f, 0x9a, 0x0e, 0x55, 0x7d, 0x43, 0x0f, 0xe6, 0xca, 0x04, 0xc6, 0x5f, 0xb1, 0x47, 0xbc, + 0x09, 0x60, 0x75, 0xb8, 0x8e, 0xa3, 0xf7, 0x80, 0x17, 0x5e, 0x32, 0x5e, 0xaa, 0x5a, 0x03, 0x1d, + 0xf9, 0xdf, 0xdb, 0xbb, 0xd6, 0x18, 0x3f, 0x7a, 0x3e, 0x65, 0x50, 0x6d, 0x55, 0x75, 0xb4, 0x08, + 0xf4, 0x9f, 0xfe, 0x09, 0xca, 0xc2, 0xdd, 0xf6, 0xe7, 0xcd, 0x64, 0x37, 0xc8, 0x0c, 0x5a, 0xa7, + 0x85, 0xb3, 0x87, 0xd5, 0x27, 0x76, 0x40, 0x63, 0xc6, 0xf0, 0xc2, 0xda, 0x0b, 0x63, 0x48, 0x83, + 0x11, 0x78, 0x2b, 0xb7, 0x56, 0xd5, 0x6a, 0x2d, 0x78, 0xca, 0xe1, 0x27, 0x80, 0x2f, 0x93, 0xed, + 0x0f, 0x08, 0xfc, 0x9f, 0x04, 0x60, 0x91, 0xcb, 0x4a, 0xd1, 0xab, 0x92, 0xf5, 0x6f, 0xcd, 0x37, + 0xd0, 0x53, 0x64, 0xaa, 0xe7, 0x8f, 0xfc, 0x27, 0xb1, 0x1b, 0xfd, 0x0f, 0x02, 0x30, 0xa5, 0xf5, + 0x78, 0x06, 0x91, 0x5c, 0x97, 0x35, 0x97, 0xf4, 0x73, 0x64, 0xcd, 0x6b, 0x5c, 0x50, 0xf2, 0x81, + 0x3b, 0x00, 0x7c, 0x2e, 0x61, 0xb3, 0xf3, 0x26, 0x6d, 0xcb, 0xf1, 0xe7, 0x00, 0xc8, 0x65, 0x51, + 0x8b, 0x1b, 0x3e, 0xf8, 0x95, 0xc0, 0xa7, 0xad, 0x28, 0x9e, 0x13, 0x24, 0x71, 0x23, 0x6f, 0x41, + 0xfb, 0x9f, 0x3e, 0xeb, 0x7d, 0xdb, 0xf7, 0xe0, 0xa3, 0xeb, 0xe7, 0x10, 0xb8, 0x01, 0x80, 0x3c, + 0x55, 0x82, 0x9b, 0x01, 0x94, 0x79, 0x22, 0x72, 0x02, 0x63, 0x6e, 0xfd, 0xe2, 0x96, 0xe0, 0xd1, + 0x59, 0x91, 0xc0, 0x8f, 0x02, 0x60, 0xe4, 0x72, 0x8c, 0x3a, 0x41, 0xc3, 0x00, 0x78, 0x67, 0x33, + 0x42, 0x20, 0x66, 0x03, 0x80, 0xf4, 0x3b, 0xa8, 0x1b, 0x60, 0xc9, 0x27, 0xee, 0x6b, 0x82, 0xb1, + 0xed, 0xe5, 0xa1, 0x48, 0xc2, 0x09, 0xab, 0x2e, 0x97, 0x0b, 0x7f, 0x54, 0x0f, 0xd3, 0x1f, 0x97, + 0x19, 0xbd, 0x3b, 0xa5, 0x53, 0x73, 0xc6, 0xde, 0x56, 0x72, 0x96, 0xa8, 0x15, 0xdb, 0x57, 0x9f, + 0xad, 0x4d, 0x2f, 0xed, 0x5b, 0x4a, 0x71, 0x66, 0x15, 0x11, 0x40, 0x3e, 0x9d, 0x4e, 0x19, 0xd6, + 0x65, 0x50, 0x00, 0x40, 0x07, 0x50, 0x04, 0x40, 0xa6, 0x34, 0xa8, 0x06, 0x50, 0x94, 0x18, 0xc4, + 0x35, 0xc5, 0x8c, 0x87, 0xe3, 0xd3, 0x04, 0x41, 0x89, 0x2b, 0x52, 0xba, 0x23, 0x61, 0xb6, 0xbf, + 0x6e, 0xd7, 0xcb, 0x05, 0xff, 0xb6, 0xeb, 0xeb, 0xa8, 0xc7, 0xe3, 0x6d, 0xf6, 0x3f, 0x61, 0xc4, + 0xf9, 0x93, 0xda, 0x9c, 0x86, 0x6d, 0x2b, 0x6f, 0x6f, 0x63, 0x86, 0xd0, 0x52, 0x7e, 0x61, 0xe4, + 0x7d, 0x38, 0x67, 0xc8, 0x5f, 0x6a, 0xb8, 0x52, 0xa4, 0x3d, 0x96, 0x03, 0xff, 0xf5, 0x0e, 0x2e, + 0x38, 0x67, 0xe4, 0x72, 0xf7, 0x31, 0x2b, 0x00, 0x63, 0x6f, 0x0b, 0xaa, 0x36, 0x4f, 0xb5, 0x59, + 0x68, 0xcd, 0x90, 0x9d, 0x6d, 0xa0, 0x5c, 0x80, 0xba, 0x83, 0x42, 0x29, 0x2f, 0xa1, 0xbe, 0x84, + 0xe9, 0xbf, 0x6d, 0xbf, 0xbf, 0x9e, 0xaf, 0x08, 0xe0, 0x7a, 0x16, 0xff, 0x33, 0xee, 0xd1, 0xa6, + 0xde, 0x27, 0xd3, 0x8c, 0xff, 0xe8, 0x2b, 0x40, 0x95, 0x09, 0x08, 0x30, 0x5e, 0xd0, 0xed, 0x2d, + 0x07, 0x69, 0x4f, 0x93, 0x2a, 0xe9, 0xc1, 0x52, 0x46, 0x00, 0xa0, 0xe5, 0x7c, 0xf4, 0x0e, 0x0c, + 0x40, 0xcb, 0x65, 0x76, 0x91, 0x33, 0x24, 0x87, 0x08, 0x98, 0x02, 0x15, 0x2b, 0x15, 0x00, 0xda, + 0xeb, 0x4e, 0x00, 0x38, 0x5e, 0xb5, 0x00, 0x78, 0x2f, 0xac, 0x00, 0x70, 0xfb, 0x22, 0x67, 0x90, + 0xc0, 0x55, 0xfc, 0xa7, 0x5d, 0x2e, 0xde, 0x24, 0x4a, 0xbc, 0xe5, 0x92, 0x8d, 0xff, 0xb8, 0x80, + 0x00, 0xf5, 0x9f, 0x29, 0xb2, 0x94, 0xf1, 0xfa, 0x4f, 0x00, 0xc5, 0xfb, 0x05, 0xc0, 0x6e, 0xdb, + 0x03, 0x90, 0xc0, 0x17, 0x00, 0x8b, 0x5c, 0xee, 0x6b, 0xc0, 0xf4, 0x17, 0x47, 0x58, 0x00, 0x10, + 0x1c, 0x01, 0x50, 0xad, 0xfa, 0xdf, 0x69, 0x3c, 0xaf, 0x72, 0x96, 0x58, 0xae, 0x8b, 0xd2, 0x81, + 0x61, 0x56, 0x3b, 0xde, 0xaf, 0xe7, 0xeb, 0xf9, 0xfc, 0xae, 0xd3, 0x2b, 0x3a, 0xdf, 0x51, 0x9c, + 0xcf, 0x59, 0xef, 0x1b, 0xc0, 0x2d, 0x00, 0x80, 0x04, 0xe9, 0x5b, 0x5f, 0xcb, 0xe9, 0x7e, 0x3c, + 0x9d, 0x34, 0x00, 0x77, 0x00, 0xb0, 0x93, 0x40, 0xee, 0x1d, 0x1c, 0x3b, 0xa6, 0x01, 0x94, 0xf6, + 0x14, 0x50, 0x23, 0xc4, 0x76, 0x9f, 0xcf, 0x13, 0x59, 0xa7, 0x88, 0xa0, 0xb5, 0x9f, 0x6a, 0xba, + 0x60, 0x04, 0xcc, 0x88, 0xc2, 0x88, 0xb8, 0x01, 0x20, 0xce, 0x6b, 0xfa, 0x7e, 0xfd, 0x83, 0xb7, + 0x80, 0x10, 0xa0, 0xc5, 0x09, 0x6f, 0x01, 0x25, 0xdf, 0x1d, 0x2d, 0x99, 0x42, 0x00, 0x97, 0x33, + 0x02, 0x20, 0xf2, 0x16, 0x1d, 0x42, 0xe1, 0x07, 0x75, 0x44, 0x2c, 0xaa, 0x3f, 0x8a, 0x78, 0x65, + 0x2d, 0x47, 0x9c, 0x69, 0x4f, 0x00, 0x46, 0x07, 0xc4, 0x47, 0x6b, 0x80, 0x9b, 0x72, 0x3d, 0x71, + 0x42, 0xcf, 0xe6, 0xf0, 0xf0, 0x9c, 0x72, 0x98, 0xfc, 0x9f, 0x00, 0x30, 0xde, 0x23, 0x9d, 0x13, + 0x39, 0x6d, 0xc7, 0x3b, 0x00, 0x20, 0x02, 0xe8, 0xff, 0x38, 0xf9, 0xbe, 0xfd, 0xb9, 0x5c, 0xce, + 0xf8, 0xb7, 0xbd, 0xf7, 0xfe, 0x14, 0x9f, 0x49, 0xa5, 0x0b, 0xb0, 0x7f, 0x9d, 0x04, 0x82, 0x83, + 0xac, 0x01, 0x54, 0x72, 0x48, 0x85, 0x04, 0x2a, 0x65, 0x6c, 0xef, 0x94, 0xf9, 0xd9, 0x00, 0xa8, + 0x03, 0x40, 0xef, 0xe0, 0xaa, 0x4f, 0x28, 0x8f, 0xd5, 0x53, 0x06, 0xf5, 0x7d, 0x59, 0xf4, 0x3d, + 0x50, 0xd6, 0x43, 0xae, 0x70, 0xff, 0x65, 0x42, 0x11, 0xa0, 0x65, 0x5d, 0xe4, 0xe9, 0x32, 0x1e, + 0xae, 0x67, 0x56, 0xd9, 0x56, 0x0a, 0x52, 0x98, 0x37, 0xc0, 0x7f, 0xf8, 0x08, 0x3c, 0xd3, 0xe7, + 0x5d, 0x3a, 0xe8, 0xec, 0x47, 0x4d, 0x2d, 0x84, 0x07, 0x46, 0xe0, 0xf4, 0x41, 0x95, 0x84, 0x40, + 0x4d, 0x6c, 0x59, 0x1d, 0xc8, 0x38, 0x55, 0x00, 0x69, 0xda, 0xcf, 0x17, 0x60, 0x69, 0x4f, 0xab, + 0x48, 0xef, 0xe0, 0x8e, 0x4a, 0xfa, 0x86, 0x7e, 0xde, 0x97, 0x7c, 0xc1, 0xbe, 0x0a, 0xfa, 0x83, + 0xde, 0xbe, 0x23, 0xe4, 0x0f, 0xcd, 0xf7, 0xd7, 0xd7, 0x57, 0xf9, 0xdc, 0xaa, 0x9f, 0xf9, 0x08, + 0x5d, 0xae, 0x4b, 0x79, 0x9e, 0x10, 0xf3, 0xf6, 0xbf, 0xb4, 0x57, 0x4d, 0x9e, 0x72, 0xf8, 0x09, + 0xe0, 0x09, 0xe0, 0x09, 0xe0, 0xd7, 0x03, 0x38, 0x26, 0x85, 0x7e, 0x17, 0x80, 0x40, 0xef, 0x5b, + 0x98, 0xf7, 0x61, 0x1e, 0x41, 0xa2, 0xde, 0x98, 0xf9, 0x47, 0x01, 0xc0, 0x86, 0x5b, 0x8b, 0xa9, + 0x5f, 0xfb, 0x8f, 0xb9, 0x79, 0xb8, 0xb3, 0xea, 0xeb, 0xd5, 0xe1, 0xf0, 0x96, 0x2a, 0xea, 0xb3, + 0x3a, 0x7e, 0x5a, 0x5b, 0xdf, 0xc9, 0xe9, 0x45, 0x39, 0x7b, 0x64, 0x7b, 0x4b, 0xff, 0xeb, 0x73, + 0x6b, 0x3e, 0xe1, 0x8b, 0x01, 0x90, 0x3a, 0x73, 0xbe, 0xe6, 0xa9, 0x97, 0xd3, 0xdc, 0x28, 0xdf, + 0xd0, 0xd7, 0xab, 0xc3, 0xd8, 0xbe, 0x86, 0xa2, 0x00, 0x9c, 0x6c, 0x92, 0xb1, 0xe7, 0x1c, 0x65, + 0x84, 0x43, 0x0e, 0xd2, 0xaf, 0xfa, 0x9f, 0xe6, 0xcb, 0x78, 0xae, 0x4b, 0x68, 0xae, 0x5f, 0x12, + 0x16, 0x5f, 0x0a, 0x00, 0xe5, 0xb7, 0xf7, 0xb8, 0x9d, 0xad, 0x26, 0x02, 0x9c, 0xd6, 0xe3, 0x46, + 0x5f, 0x2f, 0x0e, 0x1f, 0x00, 0x00, 0xa7, 0x98, 0xb4, 0xf8, 0xe1, 0x80, 0x11, 0xb1, 0x62, 0xab, + 0x0f, 0xfa, 0x9f, 0x1a, 0x06, 0x47, 0x69, 0xc7, 0xcc, 0xbb, 0x57, 0xac, 0x0f, 0x5a, 0x1c, 0x7d, + 0x0f, 0x80, 0xa4, 0x01, 0xb8, 0x05, 0xc0, 0xa2, 0xaf, 0xef, 0x02, 0x98, 0x6f, 0x30, 0xe8, 0x8c, + 0x50, 0x2f, 0xca, 0x08, 0x4b, 0xf5, 0x41, 0xff, 0x53, 0xc3, 0xf6, 0x16, 0x48, 0xb3, 0x81, 0xee, + 0xc6, 0xef, 0x05, 0xe0, 0x1d, 0xe9, 0x0d, 0xbc, 0x0b, 0xa6, 0xf8, 0xdb, 0xeb, 0x26, 0x12, 0x8e, + 0xc4, 0xbd, 0xd1, 0xd7, 0x8b, 0xc3, 0xa3, 0xac, 0x32, 0x22, 0x14, 0x4f, 0x4a, 0x0e, 0xb7, 0xe2, + 0x18, 0x61, 0xa9, 0x1e, 0xfa, 0xdf, 0xe9, 0x17, 0x38, 0x0a, 0xe7, 0x28, 0x72, 0x53, 0x51, 0xe0, + 0x52, 0x80, 0x6f, 0x04, 0x80, 0xf2, 0x8d, 0x7e, 0x3d, 0xf5, 0x55, 0xa9, 0x5f, 0x12, 0xbb, 0x75, + 0xfe, 0x7e, 0x0f, 0x46, 0x5f, 0x2f, 0x0e, 0xf3, 0x0b, 0x19, 0xfc, 0xf3, 0x7c, 0x95, 0xf7, 0x01, + 0xf0, 0x8a, 0xa9, 0x17, 0x32, 0x5a, 0x51, 0x22, 0xc0, 0x56, 0xf3, 0x4b, 0x56, 0x56, 0xff, 0xd3, + 0x60, 0x2d, 0x02, 0xea, 0xb0, 0x28, 0x2d, 0x9a, 0xfa, 0x6b, 0x1f, 0x83, 0x95, 0xd3, 0x66, 0xa2, + 0xbe, 0x0a, 0xca, 0x51, 0xca, 0x9b, 0x19, 0x81, 0xe8, 0xcc, 0x3b, 0x4e, 0xfa, 0x7d, 0x84, 0x9a, + 0xfb, 0x6f, 0xd3, 0xa3, 0x07, 0x24, 0xbc, 0xc4, 0x3a, 0xbf, 0xc0, 0x45, 0x19, 0x61, 0xa9, 0xee, + 0xc0, 0x93, 0x7a, 0x03, 0x06, 0x8d, 0xa1, 0x24, 0x08, 0x94, 0xf6, 0x93, 0x36, 0x27, 0x19, 0x5d, + 0xfa, 0x46, 0x00, 0x26, 0x3f, 0x35, 0x7e, 0x8e, 0x07, 0x33, 0xa3, 0xd2, 0xd7, 0xd3, 0xe1, 0xaa, + 0xe5, 0x2f, 0xfd, 0x1e, 0x5f, 0x67, 0x42, 0xc0, 0x4f, 0xa0, 0xad, 0x28, 0x23, 0x2c, 0xd5, 0x07, + 0xfd, 0xcf, 0x0d, 0xf9, 0x2a, 0x0c, 0xff, 0x29, 0xe1, 0x91, 0x12, 0x7c, 0x27, 0x80, 0x83, 0x64, + 0x5f, 0x7f, 0xb4, 0x5f, 0xf4, 0x75, 0xbd, 0xf3, 0x0b, 0xfe, 0x8d, 0x74, 0xc2, 0x28, 0xd6, 0x3b, + 0xd5, 0x77, 0xf4, 0x7f, 0xd5, 0xef, 0x23, 0x50, 0x90, 0xd6, 0xef, 0x8a, 0x80, 0xff, 0x05, 0x18, + 0x00, 0x3f, 0xd5, 0x68, 0x2a, 0xbe, 0xa0, 0x7b, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, + 0x44, 0xae, 0x42, 0x60, 0x82, }; #endif diff --git a/src/glyph_cyr.png b/src/glyph_cyr.png index 1869873a2ac6f432ffbb5ad740f2d23558a84189..adcc07cba1ac675a6aafc095ad03455e2f1c683a 100644 GIT binary patch delta 2205 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 diff --git a/src/lang.h b/src/lang.h index c383a45..8846e58 100644 --- a/src/lang.h +++ b/src/lang.h @@ -1742,7 +1742,7 @@ const char *STR_RU[] = { "" , "Среднее" , "Высокое" , STR_LANGUAGES - , "Принять" + , "Применить" , "Ге{импад 1" , "Ге{импад 2" , "Ге{импад 3" @@ -1850,15 +1850,15 @@ const char *STR_RU[] = { "" /* 24 */ , "" /* 25 */ , "" /* 26 */ , "Добро пожаловать ко мне домо{и.@Я проведу небольшую экскурсию." -/* 27 */ , "Использу{ите стрелки, чтобы идти в музыкальную комнату." +/* 27 */ , "Использу{ите стрелки,@чтобы идти в музыкальную комнату." /* 28 */ , "Хорошо. Теперь немного акробатики.@Нажмите клавишу прыжка." /* 29 */ , "Теперь снова нажмите прыжок и быстро нажмите одну из стрелок.@Я прыгну в одном из направлени{и." /* 30 */ , "Это главны{и холл.@Прошу прощения за беспорядок,@много веще{и нужно перенести в хранилище,@но грузчики ещ~е не прибыли." /* 31 */ , "Подо{идите к ящику и, продолжая нажимать клавишу впер~ед,@нажима{ите клавишу де{иствия,@тогда я залезу на ящик." /* 32 */ , "Раньше это был бальны{и зал, но@я переделала его для заняти{и гимнастико{и.@Что скажете?@Что ж, сделаем пару упражнени{и." /* 33 */ , "Я не всегда бегаю сломя голову.@Иногда требуется осторожно подо{ити к чему-нибудь.@Зажмите клавишу ходьбы и подо{идите к бело{и линии." -/* 34 */ , "С зажато{и клавише{и ходьбы я никуда упаду, даже если вы будете неосторожны.@Дава{ите, попробу{ите." -/* 35 */ , "Если вы хотите осмотреться, нажмите и держите клавишу смотреть,@затем нажмите клавишу нужного направления." +/* 34 */ , "С зажато{и клавише{и ходьбы я никуда упаду,@даже если вы будете неосторожны.@Дава{ите, попробу{ите." +/* 35 */ , "Если вы хотите осмотреться,@нажмите и держите клавишу смотреть,@затем нажмите клавишу нужного направления." /* 36 */ , "Если я не могу допрыгнуть куда-либо,@я могу ухватиться за кра{и и уберечься от падения.@Идите к краю с бело{и линие{и до тех пор пока я не остановлюсь.@Затем нажмите прыжок и сразу же клавишу впер~ед.@Когда я окажусь в воздухе, нажмите и держите клавишу де{иствия." /* 37 */ , "Нажмите клавишу впер~ед и я полезу наверх." /* 38 */ , "Если нажать прыжок во время бега,@то я без проблем совершу такие прыжки." @@ -1872,7 +1872,7 @@ const char *STR_RU[] = { "" /* 46 */ , "Затем отпустите клавишу." /* 47 */ , "А теперь поплаваем." /* 48 */ , "Клавиша прыжка и стрелки изменяют мо~е направление@при плавании под водо{и." -/* 49 */ , "Ах! Э!@Использу{ите клавиши впер~ед, вправо и влево для перемещения по поверхности воды.@Нажмите прыжок, чтобы нырнуть,@или плывите к краю и нажмите де{иствие,@чтобы вы{ити из воды." +/* 49 */ , "Ах! Э!@Использу{ите клавиши впер~ед, вправо и влево@для перемещения по поверхности воды.@Нажмите прыжок, чтобы нырнуть,@или плывите к краю и нажмите де{иствие,@чтобы вы{ити из воды." /* 50 */ , "Хорошо. А теперь пора переодеться в сухую одежду." /* 51 */ , "Скажи сыыыр!" /* 52 */ , "Ничего личного." diff --git a/src/lara.h b/src/lara.h index 6d70a73..291922c 100644 --- a/src/lara.h +++ b/src/lara.h @@ -2457,15 +2457,15 @@ struct Lara : Character { float h = pos.y - floor; int aIndex = animation.index; - if (floor - ceiling < 768 || h < 256) - ;// do nothing - else if (h <= 2 * 256 + 128) { + bool canClimb = (floor - ceiling >= LARA_HEIGHT) && (h >= 256); + + if (canClimb && h <= 2 * 256 + 128) { aIndex = ANIM_CLIMB_2; pos.y = floor + 512.0f; - } else if (h <= 3 * 256 + 128) { + } else if (canClimb && h <= 3 * 256 + 128) { aIndex = ANIM_CLIMB_3; pos.y = floor + 768.0f; - } else if (h <= 7 * 256 + 128) + } else if (h > 3 * 128 + 128 && h <= 7 * 256 + 128) aIndex = ANIM_CLIMB_JUMP; if (aIndex != animation.index) { @@ -3605,9 +3605,13 @@ struct Lara : Character { case STAND_GROUND : case STAND_HANG : case STAND_WADE : - if (opos.y - floor > (256 * 3 - 128) && state == STATE_RUN) - animation.setAnim(isLeftFoot ? ANIM_SMASH_RUN_LEFT : ANIM_SMASH_RUN_RIGHT); - else if (stand == STAND_HANG) + if (opos.y - floor > (256 * 3 - 128) && state == STATE_RUN) { + if (input & ACTION) { + animation.setAnim(isLeftFoot ? ANIM_STAND_LEFT : ANIM_STAND_RIGHT); + } else { + animation.setAnim(isLeftFoot ? ANIM_SMASH_RUN_LEFT : ANIM_SMASH_RUN_RIGHT); + } + } else if (stand == STAND_HANG) animation.setAnim(ANIM_HANG, -21); else if (state != STATE_ROLL_START && state != STATE_ROLL_END) animation.setAnim((state == STATE_RUN || state == STATE_WALK) ? (isLeftFoot ? ANIM_STAND_LEFT : ANIM_STAND_RIGHT) : ANIM_STAND); diff --git a/src/ui.h b/src/ui.h index e44d1cf..9e8f5be 100644 --- a/src/ui.h +++ b/src/ui.h @@ -42,7 +42,7 @@ namespace UI { int advGlyphsStart; - #define CYR_MAP "БГДЖЗИЛПУФЦЧШЩЪЫЬЭЮЯбвгджзклмнпфцчшщъыьэюя" + #define CYR_MAP "БГДЖЗИЛПУФЦЧШЩЪЫЬЭЮЯбвгджзклмнптфцчшщъыьэюя" #define CYR_MAP_COUNT COUNT(CYR_MAP) #define CYR_MAP_START 102 #define CYR_MAP_UPPERCASE 20 @@ -54,9 +54,9 @@ namespace UI { 5, 5, 5, 11, 9, 7, 8, 6, 0, 7, 7, 3, 8, 8, 13, 7, 9, 4, 12, 12, 7, 5, 7, 7, 7, 7, 7, 7, 7, 7, 16, 14, 14, 14, 16, 16, 16, 16, 16, 12, 14, 8, 8, 8, 8, 8, 8, 8, // cyrillic - 11, 11, 11, 13, 10, 13, 11, 11, 12, 12, 11, 9, 13, 13, 10, 13, // БГДЖЗИЛПУФЦЧШЩЪЫ - 9, 11, 12, 11, 10, 9, 8, 10, 11, 9, 10, 10, 11, 9, 10, 10, // ЬЭЮЯбвгджзклмнпф - 10, 9, 11, 12, 9, 11, 8, 9, 13, 9 // цчшщъыьэюя + 11, 11, 11, 13, 10, 13, 11, 11, 12, 12, 11, 9, 13, 13, 10, 13, // БГДЖЗИЛПУФЦЧШЩЪЫ + 9, 11, 12, 11, 10, 9, 8, 10, 11, 9, 10, 10, 11, 9, 10, 12, // ЬЭЮЯбвгджзклмнпт + 10, 10, 9, 11, 12, 9, 11, 8, 9, 13, 9 // фцчшщъыьэюя }; static const uint8 char_map[102 + 33*2] = { @@ -66,7 +66,7 @@ namespace UI { 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 100, 101, 102, 67, 0, 0, 0, 0, 0, 0, 0, // cyrillic 0, 110, 0, 111, 112, 0, 113, 114, 115, 0, 0, 116, 0, 0, 0, 117, 0, 0, 0, 118, 119, 0, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 0, 130, 131, 132, 133, 0, 134, 135, 0, 0, 136, 137, 138, 139, 0, 140, 0, 0, 0, 0, 141, 0, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, + 0, 130, 131, 132, 133, 0, 134, 135, 0, 0, 136, 137, 138, 139, 0, 140, 0, 0, 141, 0, 142, 0, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, }; enum Align { aLeft, aRight, aCenter, aCenterV }; @@ -82,7 +82,6 @@ namespace UI { case 'о' : return 'o'; case 'р' : return 'p'; case 'с' : return 'c'; - case 'т' : return 'm'; case 'у' : return 'y'; case 'х' : return 'x'; case 'А' : return 'A';