matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'font-latin-1'

Browse Source
This commit is contained in:
mniip 2020-03-10 01:28:57 +03:00
commit fd5867b57d
5 changed files with 139 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/IntroText.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
const char *const introTextData = const char *const introTextData =
"\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - https://powdertoy.co.uk, irc.freenode.net #powder\n" "\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - https://powdertoy.co.uk, irc.freenode.net #powder\n"
"\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n" "\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\xEE\x81\xA9\n"
"\n" "\n"
"\bgControl+C/V/X are Copy, Paste and cut respectively.\n" "\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
"\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n" "\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n"

151
data/font.cpp
View File

@ -127,7 +127,102 @@ extern const unsigned char font_data[] = {
0x02, 0x00, 0x32, 0x33, 0x33, 0x13, 0x00, 0x02, 0x00, 0x32, 0x33, 0x33, 0x13, 0x00,
0x04, 0x00, 0x00, 0x0B, 0x0C, 0x0C, 0x30, 0x0C, 0x0C, 0x0B, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x0B, 0x0C, 0x0C, 0x30, 0x0C, 0x0C, 0x0B, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x72, 0x37, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x72, 0x37, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x03, 0x00, 0x00, 0x04, 0x07, 0x20, 0x0C, 0xC3, 0x71, 0x00,
0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x03, 0xFD, 0x70, 0x27, 0x33, 0x30, 0x37, 0xFD, 0x01, 0x03, 0x20, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0xF4, 0xC1, 0x21, 0x0C, 0xF0, 0x0B, 0x0C, 0xC0, 0x00, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x00, 0x70, 0x34, 0xFD, 0xC1, 0x0C, 0xFD, 0x71, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x03, 0xB3, 0x38, 0xDC, 0xE0, 0x2F, 0x30, 0xE0, 0x2F, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
0x02, 0x00, 0x32, 0x13, 0x32, 0x13, 0x00,
0x05, 0x00, 0xF0, 0xB1, 0xCD, 0x01, 0x7D, 0x0C, 0xD3, 0x07, 0x39, 0xD2, 0xF8, 0x01, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0xDC, 0x41, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x08, 0x00, 0x00, 0x00, 0x00, 0xF4, 0x07, 0x1D, 0x1D, 0xD7, 0x36, 0x33, 0x30, 0xD7, 0x37, 0x1D, 0x1D, 0xF4, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x05, 0x7D, 0x04, 0xC3, 0xCF, 0x30, 0xFD, 0x01, 0xF0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xC7, 0x1D, 0x77, 0xC0, 0x1D, 0x70, 0x07, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x3F, 0x00, 0x03, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00,
0x08, 0x00, 0x00, 0x00, 0x00, 0xF4, 0x07, 0x1D, 0x1D, 0xF7, 0x36, 0xF3, 0x31, 0x37, 0x37, 0x1D, 0x1D, 0xF4, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xF0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x2D, 0x33, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x30, 0xE0, 0x2F, 0x30, 0x00, 0x02, 0xFE, 0x02, 0x00, 0x00, 0x00, 0x00,
0x04, 0x00, 0x1F, 0x31, 0x1C, 0x07, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x04, 0x00, 0x1F, 0x34, 0x1C, 0x34, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC7, 0x31, 0x0C, 0xC3, 0x30, 0x0D, 0xBF, 0x33, 0x00, 0x03, 0x00, 0x00,
0x07, 0x00, 0x00, 0x00, 0x40, 0xFF, 0xF4, 0x33, 0xFF, 0xCC, 0x3F, 0xD3, 0xCF, 0x00, 0x33, 0xC0, 0x0C, 0x30, 0x03, 0xCC, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x74, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 0x82, 0x03, 0x00,
0x03, 0xCD, 0xC3, 0x30, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,
0x05, 0x2D, 0xDC, 0x30, 0xC3, 0x0D, 0x2E, 0x00, 0xF0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, 0x00, 0xDD, 0x00, 0xDD, 0xD0, 0x0D, 0xDD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x00, 0x40, 0x03, 0xF0, 0x90, 0x30, 0x1C, 0xCC, 0x01, 0x28, 0x40, 0xF3, 0x34, 0x37, 0xC6, 0x0F, 0x00, 0x03, 0x00, 0x00, 0x00,
0x07, 0x00, 0x40, 0x03, 0xF0, 0x90, 0x30, 0x1C, 0xCC, 0x01, 0x28, 0x40, 0x7B, 0x34, 0x31, 0x46, 0x07, 0xF0, 0x03, 0x00, 0x00, 0x00,
0x07, 0x00, 0xC0, 0x0F, 0xD0, 0x92, 0xC0, 0x1C, 0xCF, 0x01, 0x28, 0x40, 0xF3, 0x34, 0x37, 0xC6, 0x0F, 0x00, 0x03, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x70, 0xC0, 0x02, 0x0B, 0x31, 0x34, 0xFD, 0x01, 0x00,
0x06, 0x0C, 0x40, 0x02, 0x74, 0xD0, 0x1D, 0x47, 0x33, 0x30, 0xFF, 0x33, 0x30, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0xC0, 0x00, 0x06, 0x74, 0xD0, 0x1D, 0x47, 0x33, 0x30, 0xFF, 0x33, 0x30, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0x74, 0x80, 0x08, 0x74, 0xD0, 0x1D, 0x47, 0x33, 0x30, 0xFF, 0x33, 0x30, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0x74, 0x83, 0x08, 0x74, 0xD0, 0x1D, 0x47, 0x33, 0x30, 0xFF, 0x33, 0x30, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0xDC, 0x41, 0x04, 0x74, 0xD0, 0x1D, 0x47, 0x33, 0x30, 0xFF, 0x33, 0x30, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0x74, 0xC0, 0x0C, 0xB8, 0xD0, 0x1D, 0x47, 0x33, 0x30, 0xFF, 0x33, 0x30, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
0x09, 0x00, 0x00, 0x00, 0x00, 0x40, 0xFF, 0x0B, 0x37, 0x00, 0xCA, 0x00, 0x0C, 0xBF, 0xF0, 0x0F, 0xC0, 0x30, 0x10, 0xC3, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0xF4, 0xD1, 0x34, 0x03, 0x31, 0x00, 0x03, 0x70, 0x34, 0xFD, 0x01, 0x09, 0x38, 0x00, 0x00,
0x06, 0x0C, 0x40, 0x02, 0xFF, 0x32, 0x00, 0x03, 0xF0, 0x0B, 0x03, 0x30, 0x10, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0xC0, 0x00, 0x06, 0xFF, 0x32, 0x00, 0x03, 0xF0, 0x0B, 0x03, 0x30, 0x10, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0x74, 0x80, 0x08, 0xFF, 0x32, 0x00, 0x03, 0xF0, 0x0B, 0x03, 0x30, 0x10, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0xDC, 0x41, 0x04, 0xFF, 0x32, 0x00, 0x03, 0xF0, 0x0B, 0x03, 0x30, 0x10, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,
0x04, 0x03, 0x09, 0x1D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x04, 0x30, 0x18, 0x1D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x04, 0x1D, 0x22, 0x1D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x04, 0x77, 0x11, 0x1D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x07, 0x00, 0x00, 0x00, 0xC0, 0x0F, 0x30, 0x1D, 0x0C, 0xCD, 0x1F, 0xC3, 0xC0, 0x30, 0x34, 0xFC, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x74, 0x03, 0x22, 0x70, 0xD0, 0x3C, 0x30, 0x37, 0xCC, 0x28, 0x33, 0xDC, 0x0C, 0x3C, 0x03, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x30, 0x00, 0x24, 0x40, 0x1F, 0x74, 0x1C, 0x07, 0xCD, 0x00, 0x33, 0xD0, 0x1C, 0x1D, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0xC0, 0x00, 0x18, 0x40, 0x1F, 0x74, 0x1C, 0x07, 0xCD, 0x00, 0x33, 0xD0, 0x1C, 0x1D, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0xD0, 0x01, 0x88, 0x40, 0x1F, 0x74, 0x1C, 0x07, 0xCD, 0x00, 0x33, 0xD0, 0x1C, 0x1D, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x74, 0x03, 0x22, 0x40, 0x1F, 0x74, 0x1C, 0x07, 0xCD, 0x00, 0x33, 0xD0, 0x1C, 0x1D, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x74, 0x03, 0x44, 0x40, 0x1F, 0x74, 0x1C, 0x07, 0xCD, 0x00, 0x33, 0xD0, 0x1C, 0x1D, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x00, 0x60, 0x24, 0xDD, 0x41, 0x07, 0xDD, 0x61, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x00, 0x00, 0x00, 0x40, 0xDF, 0x74, 0x1C, 0xC7, 0xCD, 0x28, 0x73, 0xD3, 0x78, 0x1D, 0xFB, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x30, 0x00, 0x24, 0x30, 0xC0, 0x0C, 0x30, 0x03, 0xCC, 0x00, 0x33, 0xD0, 0x2C, 0x1D, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0xC0, 0x00, 0x18, 0x30, 0xC0, 0x0C, 0x30, 0x03, 0xCC, 0x00, 0x33, 0xD0, 0x2C, 0x1D, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0xD0, 0x01, 0x88, 0x30, 0xC0, 0x0C, 0x30, 0x03, 0xCC, 0x00, 0x33, 0xD0, 0x2C, 0x1D, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x74, 0x03, 0x44, 0x30, 0xC0, 0x0C, 0x30, 0x03, 0xCC, 0x00, 0x33, 0xD0, 0x2C, 0x1D, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0xC0, 0x00, 0x06, 0x03, 0xB3, 0x38, 0xDC, 0x40, 0x07, 0x30, 0x00, 0x03, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x20, 0x00, 0x03, 0xF0, 0x07, 0xC3, 0x31, 0x34, 0x47, 0xF3, 0x0F, 0x03, 0x10, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x7D, 0x30, 0x0C, 0x73, 0x30, 0x1E, 0x43, 0x33, 0x32, 0xE3, 0x01, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xC0, 0x00, 0x09, 0x7D, 0x04, 0xC3, 0xCF, 0x30, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x03, 0x06, 0x7D, 0x04, 0xC3, 0xCF, 0x30, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x40, 0x07, 0x22, 0x7D, 0x04, 0xC3, 0xCF, 0x30, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xD0, 0x8D, 0x08, 0x7D, 0x04, 0xC3, 0xCF, 0x30, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xC0, 0x1D, 0x11, 0x7D, 0x04, 0xC3, 0xCF, 0x30, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0xD0, 0xC1, 0x0C, 0x1D, 0x7D, 0x04, 0xC3, 0xCF, 0x30, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0x1F, 0xC1, 0x30, 0xFC, 0x2F, 0xC3, 0x00, 0x7D, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x5C, 0x32, 0xC0, 0x24, 0x3D, 0x90, 0xE0, 0x00, 0x00,
0x05, 0x00, 0x00, 0xC0, 0x00, 0x09, 0x7D, 0x0C, 0xF3, 0xCB, 0x00, 0xBD, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x03, 0x06, 0x7D, 0x0C, 0xF3, 0xCB, 0x00, 0xBD, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xC0, 0x81, 0x08, 0x7D, 0x0C, 0xF3, 0xCB, 0x00, 0xBD, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x70, 0x47, 0x04, 0x7D, 0x0C, 0xF3, 0xCB, 0x00, 0xBD, 0x00, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x03, 0x09, 0x00, 0x0D, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x30, 0x18, 0x00, 0x0D, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x1D, 0x23, 0x00, 0x0D, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x11, 0x77, 0x00, 0x0D, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xD0, 0x0D, 0x1D, 0xD8, 0xF4, 0x33, 0xCC, 0x34, 0x7D, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xD0, 0x8D, 0x08, 0x7F, 0x1C, 0x33, 0xCC, 0x30, 0xD3, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xC0, 0x00, 0x09, 0x7D, 0x1C, 0x33, 0xCC, 0x34, 0x7D, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x03, 0x06, 0x7D, 0x1C, 0x33, 0xCC, 0x34, 0x7D, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xD0, 0x81, 0x08, 0x7D, 0x1C, 0x33, 0xCC, 0x34, 0x7D, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xD0, 0x8D, 0x08, 0x7D, 0x1C, 0x33, 0xCC, 0x34, 0x7D, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x70, 0x47, 0x04, 0x7D, 0x1C, 0x33, 0xCC, 0x34, 0x7D, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x10, 0x40, 0x07, 0x10, 0xF0, 0x3F, 0x10, 0x40, 0x07, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xED, 0xDC, 0xB2, 0x8E, 0x37, 0x7B, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xC0, 0x00, 0x09, 0xC7, 0x0D, 0x33, 0xCC, 0x34, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x03, 0x06, 0xC7, 0x0D, 0x33, 0xCC, 0x34, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x40, 0x07, 0x22, 0xC7, 0x0D, 0x33, 0xCC, 0x34, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xC0, 0x1D, 0x11, 0xC7, 0x0D, 0x33, 0xCC, 0x34, 0xFD, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x03, 0x06, 0xC3, 0x0C, 0x73, 0x4C, 0x37, 0x74, 0xC0, 0xF0, 0x01, 0x00,
0x05, 0x00, 0x00, 0x30, 0xC0, 0x00, 0x7F, 0x1C, 0x33, 0xCC, 0x34, 0x7F, 0x0C, 0x30, 0x00, 0x00,
0x05, 0x00, 0x00, 0x70, 0x47, 0x04, 0xC3, 0x0C, 0x73, 0x4C, 0x37, 0x74, 0xC0, 0xF0, 0x01, 0x00,
0x08, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x1F, 0x00, 0x7F, 0x00, 0xFF, 0x01, 0xFF, 0x07, 0xFF, 0x1F, 0xFF, 0x7F, 0xFF, 0x1B, 0xBF, 0x01, 0x1B, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x1F, 0x00, 0x7F, 0x00, 0xFF, 0x01, 0xFF, 0x07, 0xFF, 0x1F, 0xFF, 0x7F, 0xFF, 0x1B, 0xBF, 0x01, 0x1B, 0x00,
0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xFF, 0x00, 0x00, 0xF8, 0xF0, 0x3F, 0xEE, 0x2C, 0x30, 0xCB, 0x0B, 0x30, 0x42, 0xC3, 0x33, 0x00, 0x03, 0x30, 0x00, 0xF3, 0x33, 0x00, 0x03, 0x30, 0x00, 0xFF, 0x3F, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xFF, 0x00, 0x00, 0xF8, 0xF0, 0x3F, 0xEE, 0x2C, 0x30, 0xCB, 0x0B, 0x30, 0x42, 0xC3, 0x33, 0x00, 0x03, 0x30, 0x00, 0xF3, 0x33, 0x00, 0x03, 0x30, 0x00, 0xFF, 0x3F, 0x00,
0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0xCB, 0x00, 0x00, 0xEE, 0xC0, 0xFF, 0xF8, 0xB0, 0xC0, 0xFF, 0x2C, 0xC0, 0x00, 0x0C, 0xCF, 0x00, 0x0C, 0xC0, 0x00, 0xCC, 0xCF, 0x00, 0x0C, 0xC0, 0x00, 0xFC, 0xFF, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0xCB, 0x00, 0x00, 0xEE, 0xC0, 0xFF, 0xF8, 0xB0, 0xC0, 0xFF, 0x2C, 0xC0, 0x00, 0x0C, 0xCF, 0x00, 0x0C, 0xC0, 0x00, 0xCC, 0xCF, 0x00, 0x0C, 0xC0, 0x00, 0xFC, 0xFF,
@ -233,7 +328,7 @@ extern const unsigned char font_data[] = {
0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x68, 0x00, 0xA2, 0x02, 0x80, 0x0A, 0x00, 0x25, 0x00, 0x44, 0x08, 0x10, 0x01, 0x40, 0x04, 0x00, 0x14, 0x00, 0x10, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x68, 0x00, 0xA2, 0x02, 0x80, 0x0A, 0x00, 0x25, 0x00, 0x44, 0x08, 0x10, 0x01, 0x40, 0x04, 0x00, 0x14, 0x00, 0x10, 0x00, 0x00,
0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xFF, 0x00, 0xFF, 0x0F, 0xF0, 0xFF, 0x00, 0xFF, 0x0F, 0xF0, 0xFF, 0x00, 0xFF, 0x0F, 0xF0, 0xFA, 0x00, 0x5B, 0x0E, 0x60, 0x90, 0x00, 0x01, 0x04, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xFF, 0x00, 0xFF, 0x0F, 0xF0, 0xFF, 0x00, 0xFF, 0x0F, 0xF0, 0xFF, 0x00, 0xFF, 0x0F, 0xF0, 0xFA, 0x00, 0x5B, 0x0E, 0x60, 0x90, 0x00, 0x01, 0x04,
0x06, 0x00, 0x00, 0x00, 0xCD, 0xF1, 0x3F, 0xFD, 0x41, 0x06, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xCD, 0xF1, 0x3F, 0xFD, 0x41, 0x06, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 0x04, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 0x06, 0x00, 0x00, 0x00, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07,
0x06, 0x00, 0x00, 0x00, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 0x06, 0x00, 0x00, 0x00, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07,
0x06, 0x00, 0x00, 0x00, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 0x06, 0x00, 0x00, 0x00, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07,
@ -275,29 +370,43 @@ extern const unsigned short font_ptrs[] = {
0x0687, 0x0691, 0x06A1, 0x06B1, 0x06C1, 0x06D1, 0x06E1, 0x06EE, 0x0687, 0x0691, 0x06A1, 0x06B1, 0x06C1, 0x06D1, 0x06E1, 0x06EE,
0x06FE, 0x070E, 0x071B, 0x0728, 0x0738, 0x0745, 0x0758, 0x0768, 0x06FE, 0x070E, 0x071B, 0x0728, 0x0738, 0x0745, 0x0758, 0x0768,
0x0778, 0x0788, 0x0798, 0x07A5, 0x07B5, 0x07C2, 0x07D2, 0x07E2, 0x0778, 0x0788, 0x0798, 0x07A5, 0x07B5, 0x07C2, 0x07D2, 0x07E2,
0x07F5, 0x0805, 0x0815, 0x0825, 0x0832, 0x0839, 0x0846, 0x0859, 0x07F5, 0x0805, 0x0815, 0x0825, 0x0832, 0x0839, 0x0846,
0x0866, 0x087F, 0x08A4, 0x08C9, 0x08E8, 0x090D, 0x092C, 0x094B, 0x0859, 0x0869, 0x0873, 0x0886, 0x0899, 0x08AC, 0x08BF, 0x08C6,
0x096A, 0x0989, 0x09A8, 0x09C7, 0x09E6, 0x0A0B, 0x0A1E, 0x0A3D, 0x08D6, 0x08E9, 0x0902, 0x0912, 0x0925, 0x0938, 0x0939, 0x0952,
0x0A5C, 0x0A7B, 0x0A9A, 0x0AB3, 0x0AD5, 0x0AF7, 0x0B1C, 0x0B41, 0x0962, 0x096F, 0x0982, 0x098F, 0x099C, 0x09AC, 0x09BF, 0x09D5,
0x0B5D, 0x0B79, 0x0B95, 0x0BB1, 0x0BCD, 0x0BE9, 0x0C05, 0x0C21, 0x09E5, 0x09F5, 0x09FF, 0x0A0F, 0x0A25, 0x0A3B, 0x0A51, 0x0A67,
0x0C3D, 0x0C59, 0x0C75, 0x0C94, 0x0CB6, 0x0CD8, 0x0CF1, 0x0D10, 0x0A7A, 0x0A8D, 0x0AA0, 0x0AB3, 0x0AC6, 0x0AD9, 0x0AEC, 0x0B08,
0x0D2F, 0x0D4E, 0x0D6D, 0x0D89, 0x0D96, 0x0DA0, 0x0DAA, 0x0DBA, 0x0B1B, 0x0B2E, 0x0B41, 0x0B54, 0x0B67, 0x0B74, 0x0B81, 0x0B8E,
0x0DCA, 0x0DDA, 0x0DEA, 0x0DFA, 0x0E0A, 0x0E1A, 0x0E2A, 0x0E3A, 0x0B9B, 0x0BB1, 0x0BC7, 0x0BDD, 0x0BF3, 0x0C09, 0x0C1F, 0x0C35,
0x0E4A, 0x0E5A, 0x0E67, 0x0E71, 0x0E7B, 0x0E8B, 0x0E9E, 0x0EB1, 0x0C48, 0x0C5E, 0x0C74, 0x0C8A, 0x0CA0, 0x0CB6, 0x0CC9, 0x0CDC,
0x0ED0, 0x0EEF, 0x0F0E, 0x0F2D, 0x0F4C, 0x0F6B, 0x0F8A, 0x0FA9, 0x0CEF, 0x0CFF, 0x0D0F, 0x0D1F, 0x0D2F, 0x0D3F, 0x0D4F, 0x0D68,
0x0FC8, 0x0FE7, 0x1006, 0x1025, 0x1044, 0x1063, 0x1082, 0x10A1, 0x0D78, 0x0D88, 0x0D98, 0x0DA8, 0x0DB8, 0x0DC5, 0x0DD2, 0x0DDF,
0x10BD, 0x10DC, 0x10FB, 0x111A, 0x1139, 0x1158, 0x1177, 0x1196, 0x0DEC, 0x0DFC, 0x0E0C, 0x0E1C, 0x0E2C, 0x0E3C, 0x0E4C, 0x0E5C,
0x11B5, 0x11C5, 0x11DE, 0x11FA, 0x1219, 0x1238, 0x1257, 0x1276, 0x0E6F, 0x0E7F, 0x0E8F, 0x0E9F, 0x0EAF, 0x0EBF, 0x0ECF, 0x0EDF,
0x1295, 0x12B7, 0x12D6, 0x12F5, 0x1314, 0x1339, 0x1358, 0x1377,
0x1396, 0x13A9, 0x13BC, 0x13CF, 0x13E2, 0x13F5, 0x1408, 0x141B,
0x142E, 0x1441, 0x1454, 0x1467, 0x147A, 0x148D, 0x14A0, 0x14B3,
0x14C6, 0x14D9, 0x14EC, 0x14FF, 0x1512, 0x1525, 0x1538, 0x154B,
0x155E, 0x0EEF, 0x0F08, 0x0F2D, 0x0F52, 0x0F71, 0x0F96, 0x0FB5, 0x0FD4,
0x0FF3, 0x1012, 0x1031, 0x1050, 0x106F, 0x1094, 0x10A7, 0x10C6,
0x10E5, 0x1104, 0x1123, 0x113C, 0x115E, 0x1180, 0x11A5, 0x11CA,
0x11E6, 0x1202, 0x121E, 0x123A, 0x1256, 0x1272, 0x128E, 0x12AA,
0x12C6, 0x12E2, 0x12FE, 0x131D, 0x133F, 0x1361, 0x137A, 0x1399,
0x13B8, 0x13D7, 0x13F6, 0x1412, 0x141F, 0x1429, 0x1433, 0x1443,
0x1453, 0x1463, 0x1473, 0x1483, 0x1493, 0x14A3, 0x14B3, 0x14C3,
0x14D3, 0x14E3, 0x14F0, 0x14FA, 0x1504, 0x1514, 0x1527, 0x153A,
0x1559, 0x1578, 0x1597, 0x15B6, 0x15D5, 0x15F4, 0x1613, 0x1632,
0x1651, 0x1670, 0x168F, 0x16AE, 0x16CD, 0x16EC, 0x170B, 0x172A,
0x1746, 0x1765, 0x1784, 0x17A3, 0x17C2, 0x17E1, 0x1800, 0x181F,
0x183E, 0x184E, 0x1867, 0x1883, 0x18A2, 0x18C1, 0x18E0, 0x18FF,
0x191E, 0x1940, 0x195F, 0x197E, 0x199D, 0x19C2, 0x19E1, 0x1A00,
0x1A1F, 0x1A32, 0x1A3F, 0x1A52, 0x1A65, 0x1A78, 0x1A8B, 0x1A9E,
0x1AB1, 0x1AC4, 0x1AD7, 0x1AEA, 0x1AFD, 0x1B10, 0x1B23, 0x1B36,
0x1B49, 0x1B5C, 0x1B6F, 0x1B82, 0x1B95, 0x1BA8, 0x1BBB, 0x1BCE,
0x1BE1,
}; };
extern const unsigned int font_ranges[][2] = { extern const unsigned int font_ranges[][2] = {
{ 0x000000, 0x00007F }, { 0x000000, 0x00007E },
{ 0x0000A0, 0x0000FF },
{ 0x00E000, 0x00E07F }, { 0x00E000, 0x00E07F },
{ 0x00FFFD, 0x00FFFD }, { 0x00FFFD, 0x00FFFD },
{ 0, 0 }, { 0, 0 },

2
src/gui/game/GameView.cpp
View File

@ -190,7 +190,7 @@ GameView::GameView():
buttonTip(""), buttonTip(""),
isButtonTipFadingIn(false), isButtonTipFadingIn(false),
introText(2048), introText(2048),
introTextMessage(ByteString(introTextData).FromAscii()), introTextMessage(ByteString(introTextData).FromUtf8()),
doScreenshot(false), doScreenshot(false),
screenshotIndex(0), screenshotIndex(0),

6
src/gui/interface/Textbox.cpp
View File

@ -181,7 +181,7 @@ void Textbox::cutSelection()
void Textbox::pasteIntoSelection() void Textbox::pasteIntoSelection()
{ {
String newText = format::CleanString(ClipboardPull().FromUtf8(), true, true, inputType != Multiline, inputType == Number || inputType == Numeric); String newText = format::CleanString(ClipboardPull().FromUtf8(), false, true, inputType != Multiline, inputType == Number || inputType == Numeric);
if (HasSelection()) if (HasSelection())
{ {
if (getLowerSelectionBound() < 0 || getHigherSelectionBound() > (int)backingText.length()) if (getLowerSelectionBound() < 0 || getHigherSelectionBound() > (int)backingText.length())
@ -263,7 +263,7 @@ bool Textbox::CharacterValid(int character)
return true; return true;
case All: case All:
default: default:
return (character >= ' ' && character < 127); return true;
} }
return false; return false;
} }
@ -494,7 +494,7 @@ void Textbox::OnTextInput(String text)
{ {
backingText.Insert(cursor, text); backingText.Insert(cursor, text);
} }
cursor++; cursor += text.length();
} }
ClearSelection(); ClearSelection();
AfterTextChange(true); AfterTextChange(true);

7
src/lua/LuaScriptInterface.cpp
View File

@ -3930,13 +3930,14 @@ int LuaScriptInterface::Command(String command)
if (lastCode.length()) if (lastCode.length())
lastCode += "\n"; lastCode += "\n";
lastCode += command; lastCode += command;
String tmp = "return " + lastCode; ByteString tmp = ("return " + lastCode).ToUtf8();
ui::Engine::Ref().LastTick(Platform::GetTime()); ui::Engine::Ref().LastTick(Platform::GetTime());
luaL_loadbuffer(l, tmp.ToUtf8().c_str(), tmp.length(), "@console"); luaL_loadbuffer(l, tmp.c_str(), tmp.length(), "@console");
if (lua_type(l, -1) != LUA_TFUNCTION) if (lua_type(l, -1) != LUA_TFUNCTION)
{ {
lua_pop(l, 1); lua_pop(l, 1);
luaL_loadbuffer(l, lastCode.ToUtf8().c_str(), lastCode.length(), "@console"); ByteString lastCodeUtf8 = lastCode.ToUtf8();
luaL_loadbuffer(l, lastCodeUtf8.c_str(), lastCodeUtf8.length(), "@console");
} }
if (lua_type(l, -1) != LUA_TFUNCTION) if (lua_type(l, -1) != LUA_TFUNCTION)
{ {