Merge branch 'master' into add-squirrel

bin/assets/config.tic.dat

@@ -1 +1 @@
-0x78, 0xda, 0xed, 0x19, 0x4b, 0x6c, 0x1b, 0xc7, 0x75, 0x1d, 0x3b, 0x6d, 0xc8, 0xb8, 0x1e, 0x0b, 0x28, 0x82, 0x7e, 0xd2, 0x66, 0xa1, 0xa6, 0x2d, 0x29, 0x91, 0x14, 0x45, 0x4a, 0xaa, 0x6b, 0x77, 0x9b, 0xca, 0x22, 0x2d, 0xa9, 0x91, 0x44, 0x43, 0x9f, 0xb8, 0x81, 0x91, 0xa8, 0x2b, 0x72, 0x57, 0x22, 0x42, 0x71, 0xd5, 0x5d, 0xd2, 0x92, 0x1c, 0x08, 0x08, 0x02, 0x04, 0x50, 0x4f, 0xee, 0xc1, 0x05, 0xaa, 0x93, 0x52, 0xe4, 0xa6, 0x5e, 0x7a, 0x31, 0x50, 0x54, 0x07, 0xa3, 0x3d, 0x06, 0x68, 0x51, 0x04, 0x45, 0x0f, 0x45, 0xd1, 0x4b, 0xd1, 0x2b, 0x3d, 0x27, 0xa3, 0x46, 0x80, 0x6c, 0xdf, 0x9b, 0x99, 0x5d, 0xee, 0x67, 0x56, 0x76, 0x00, 0x27, 0x05, 0x0a, 0xcd, 0x7a, 0x38, 0x9f, 0x37, 0xef, 0xcd, 0xfb, 0xcf, 0x8c, 0x7c, 0xe6, 0xfd, 0x2f, 0x28, 0x9f, 0xb8, 0x50, 0x06, 0x07, 0x07, 0xef, 0xec, 0xef, 0xef, 0xdf, 0xc1, 0x16, 0x86, 0x77, 0x5c, 0xea, 0x57, 0xd7, 0x7d, 0xd0, 0x1b, 0x1c, 0x74, 0x7b, 0xfb, 0xfb, 0xb4, 0x37, 0xf8, 0x2e, 0xed, 0xb9, 0x77, 0xa8, 0x4b, 0xef, 0x50, 0xea, 0x55, 0x86, 0x3f, 0x30, 0x30, 0x60, 0x99, 0xa6, 0x69, 0x61, 0x0b, 0x43, 0x0b, 0xf0, 0xbc, 0x8a, 0xf8, 0x03, 0x03, 0x6e, 0xcf, 0x34, 0x69, 0x6f, 0x40, 0x07, 0x7c, 0x8b, 0xf6, 0x28, 0xaf, 0x0f, 0xa8, 0xa5, 0xb8, 0x0c, 0xbf, 0x52, 0xa9, 0x1c, 0x1e, 0x1c, 0x1c, 0x1c, 0x62, 0x0b, 0xc3, 0x43, 0x02, 0x15, 0x70, 0x0f, 0x05, 0x7e, 0xa5, 0xe2, 0xf6, 0x0e, 0x0e, 0x68, 0xaf, 0x72, 0x17, 0xf0, 0x0f, 0x69, 0x8f, 0x40, 0xa5, 0x87, 0x80, 0x7f, 0x28, 0xf0, 0x57, 0x56, 0x56, 0xee, 0x1f, 0x1f, 0x1f, 0xdf, 0xc7, 0x16, 0x86, 0xac, 0x12, 0x85, 0x60, 0x8b, 0xf8, 0x2b, 0x2b, 0x6e, 0xef, 0xf8, 0x98, 0xf6, 0x56, 0xee, 0x01, 0xfe, 0x7d, 0xa0, 0x79, 0x9f, 0x52, 0x05, 0x2a, 0xb6, 0xef, 0x1f, 0x1d, 0xa5, 0x8f, 0xb0, 0x5c, 0xfe, 0xe0, 0xe8, 0xa8, 0x5c, 0x3e, 0xba, 0x5c, 0x2e, 0x7f, 0x80, 0x43, 0xf8, 0xb9, 0x5c, 0x2c, 0x97, 0xcf, 0x7a, 0x70, 0x36, 0x0f, 0x70, 0xb6, 0x2e, 0x06, 0xff, 0x40, 0xe0, 0x8b, 0x16, 0xc6, 0x21, 0xf8, 0x65, 0x41, 0xff, 0xb2, 0xc0, 0xbf, 0xdc, 0xc7, 0xff, 0xed, 0xf1, 0xf1, 0xf3, 0xc7, 0x37, 0xef, 0x1d, 0x1f, 0xdf, 0xbb, 0xc9, 0xeb, 0xca, 0x0a, 0x6b, 0x61, 0xe6, 0xe6, 0xf5, 0x95, 0x95, 0x67, 0x7f, 0x6a, 0x9a, 0x5f, 0x30, 0x07, 0x74, 0xd3, 0xd4, 0x5f, 0x30, 0x83, 0x2d, 0xf4, 0x5e, 0xb8, 0x38, 0x30, 0x70, 0xe6, 0x9d, 0xfd, 0xfd, 0xe7, 0xf6, 0xdf, 0xcd, 0xec, 0xb3, 0x9a, 0x79, 0x77, 0xdf, 0xeb, 0x43, 0x2f, 0xa3, 0x0e, 0x0e, 0x3e, 0xf3, 0x8b, 0x83, 0x83, 0xd4, 0xc1, 0xdd, 0xd9, 0x03, 0x56, 0x67, 0x2b, 0xa0, 0x65, 0x6c, 0xef, 0x1e, 0xdc, 0x85, 0xdf, 0x1f, 0x55, 0x2a, 0xe7, 0x98, 0xbd, 0xd1, 0xf6, 0xec, 0xfb, 0x0f, 0xeb, 0x8f, 0x80, 0x1f, 0xb8, 0x0a, 0x45, 0xdd, 0x7e, 0xe2, 0xde, 0x51, 0x5c, 0xb0, 0xfd, 0x83, 0x3b, 0x60, 0xff, 0x7d, 0x51, 0xd1, 0x1f, 0x14, 0xfa, 0xa0, 0xe7, 0xba, 0xbd, 0x1e, 0xb3, 0x37, 0xda, 0xde, 0x7c, 0x08, 0x2d, 0x7e, 0xa6, 0xf9, 0x12, 0xf8, 0x81, 0x8f, 0x6f, 0x51, 0x0a, 0xb6, 0x67, 0xd5, 0x32, 0xa9, 0xcb, 0xfc, 0x60, 0xa0, 0x8f, 0xcf, 0xec, 0x8d, 0xb6, 0x7f, 0xf4, 0xe8, 0xd1, 0xe1, 0xc1, 0xe1, 0x21, 0xf6, 0x6b, 0xe0, 0x07, 0x3e, 0xfe, 0x21, 0xa5, 0x60, 0x7b, 0xfa, 0x08, 0xea, 0xe1, 0x01, 0x75, 0x99, 0x1f, 0x54, 0xfa, 0xf8, 0xcc, 0xd6, 0x68, 0xfb, 0x63, 0x6c, 0x3f, 0x66, 0xfd, 0x55, 0xf0, 0x03, 0x1f, 0xff, 0xbe, 0xe2, 0x82, 0xed, 0x1f, 0xdc, 0x07, 0xfb, 0x1f, 0x8b, 0x8a, 0xfe, 0xe0, 0xe1, 0x2b, 0x50, 0x92, 0x7c, 0x00, 0xe7, 0x83, 0xf0, 0xa8, 0x0f, 0x84, 0xe1, 0x71, 0x1f, 0x08, 0xc1, 0x25, 0x3e, 0xe0, 0xc1, 0x93, 0x7c, 0x00, 0xe7, 0x11, 0x9e, 0xe4, 0x03, 0x38, 0x8f, 0xf0, 0x24, 0x1f, 0xc0, 0x79, 0x84, 0x27, 0xf9, 0x00, 0xce, 0x4b, 0xe3, 0x97, 0x15, 0xd3, 0xb2, 0xdc, 0x87, 0xd1, 0xf8, 0x75, 0xd1, 0x9e, 0x16, 0xda, 0x14, 0xea, 0x43, 0xa8, 0x8a, 0x72, 0x71, 0x00, 0xfe, 0x0d, 0x28, 0x80, 0x7b, 0x51, 0xd4, 0x50, 0x81, 0xfd, 0xf1, 0x07, 0x5c, 0x15, 0x97, 0x78, 0xf5, 0x8c, 0x57, 0xdf, 0x5c, 0xe9, 0xf5, 0xee, 0x7d, 0xfc, 0xef, 0xde, 0xbd, 0x63, 0x5e, 0x71, 0x1c, 0x2c, 0xca, 0x69, 0xf9, 0x4c, 0x4b, 0x3f, 0x7e, 0xb1, 0x7d, 0xe8, 0xc6, 0xe3, 0x57, 0xc1, 0x98, 0x7d, 0x00, 0xb1, 0xcb, 0x7c, 0x20, 0x1a, 0xbf, 0x9e, 0x99, 0x3d, 0xdb, 0x33, 0x03, 0xa3, 0x3f, 0xa0, 0x5f, 0x30, 0xdb, 0xfb, 0xb6, 0x16, 0xb6, 0x3f, 0xc3, 0xfd, 0x41, 0xec, 0xff, 0xc3, 0x72, 0xaf, 0xe7, 0x6c, 0xff, 0xcb, 0xaf, 0x38, 0x0e, 0x96, 0x67, 0x3e, 0x7c, 0xe9, 0xd4, 0x48, 0xa7, 0xe5, 0xb4, 0x9c, 0x96, 0xe4, 0xe2, 0x06, 0xaa, 0x12, 0x68, 0x45, 0xc1, 0x53, 0x0a, 0x6b, 0x52, 0x41, 0x98, 0xeb, 0x92, 0x50, 0x1b, 0x82, 0xc3, 0x1c, 0x21, 0xd8, 0xc2, 0x00, 0x3a, 0x6e, 0x84, 0x3e, 0x40, 0x01, 0xc8, 0x3a, 0xa2, 0x21, 0x61, 0x7c, 0x8e, 0xa6, 0x50, 0xf8, 0x21, 0x94, 0xb7, 0x11, 0x02, 0x0a, 0x3d, 0x49, 0x3e, 0x01, 0xf7, 0x6a, 0x84, 0x7c, 0x7f, 0x8e, 0x24, 0xd0, 0x22, 0xb8, 0x3f, 0x61, 0xfc, 0x63, 0x1b, 0xc5, 0xf7, 0xf7, 0x70, 0x15, 0x39, 0x2c, 0xb8, 0x17, 0x49, 0xe6, 0x97, 0xba, 0x8f, 0x37, 0x15, 0x25, 0x82, 0x86, 0x4c, 0xc0, 0x7e, 0x13, 0xa3, 0xeb, 0xc2, 0xac, 0x57, 0x63, 0xfb, 0xb8, 0x62, 0x6f, 0xd7, 0xeb, 0x87, 0x29, 0x30, 0x7b, 0x51, 0x22, 0xe8, 0x70, 0x1b, 0x87, 0xe1, 0x82, 0x29, 0xd4, 0x0f, 0x4d, 0xa6, 0xef, 0x52, 0x6f, 0xad, 0x12, 0xc3, 0x77, 0x03, 0xfb, 0x44, 0xfd, 0xa3, 0xbf, 0xaf, 0x22, 0xe5, 0x3f, 0xb8, 0Line truncated
+0x78, 0xda, 0xed, 0x19, 0x4b, 0x6c, 0x1b, 0xc7, 0x75, 0x1d, 0x3b, 0x6d, 0xc8, 0xb8, 0x1e, 0x0b, 0x28, 0x82, 0x7e, 0xd2, 0x66, 0xa1, 0xa6, 0x2d, 0x29, 0x91, 0x14, 0x45, 0x4a, 0xaa, 0x6b, 0x77, 0x9b, 0xca, 0x22, 0x2d, 0xa9, 0xd1, 0xc7, 0x90, 0xc4, 0xb8, 0x81, 0x91, 0xa8, 0x2b, 0x72, 0x57, 0x22, 0x42, 0x71, 0xd5, 0x5d, 0xd2, 0x92, 0x1c, 0x08, 0x08, 0x02, 0x04, 0x50, 0x4f, 0xee, 0xc1, 0x05, 0xaa, 0x93, 0x52, 0xe4, 0xa6, 0x5e, 0x7a, 0xf1, 0xa5, 0x3a, 0x18, 0x2d, 0x7a, 0x0a, 0xd0, 0xa2, 0x08, 0x8a, 0x1e, 0x8a, 0xa2, 0x97, 0xa2, 0x57, 0x7a, 0x4e, 0x46, 0x8d, 0x00, 0xd9, 0xbe, 0x37, 0x33, 0xbb, 0xdc, 0xcf, 0xac, 0xec, 0x00, 0x4e, 0x0a, 0x14, 0x9a, 0xf5, 0x70, 0x3e, 0x6f, 0xde, 0x9b, 0xf7, 0x9f, 0x19, 0xf9, 0xcc, 0xfb, 0x5f, 0x50, 0x3e, 0x71, 0xa1, 0x0c, 0x0e, 0x0e, 0xde, 0xd9, 0xdf, 0xdf, 0xbf, 0x83, 0x2d, 0x0c, 0xef, 0xb8, 0xd4, 0xaf, 0xae, 0xfb, 0xa0, 0x37, 0x38, 0xe8, 0xf6, 0xf6, 0xf7, 0x69, 0x6f, 0xf0, 0x5d, 0xda, 0x73, 0xef, 0x50, 0x97, 0xde, 0xa1, 0xd4, 0xab, 0x0c, 0x7f, 0x60, 0x60, 0xc0, 0x32, 0x4d, 0xd3, 0xc2, 0x16, 0x86, 0x16, 0xe0, 0x79, 0x15, 0xf1, 0x07, 0x06, 0xdc, 0x9e, 0x69, 0xd2, 0xde, 0x80, 0x0e, 0xf8, 0x16, 0xed, 0x51, 0x5e, 0x1f, 0x50, 0x4b, 0x71, 0x19, 0x7e, 0xa5, 0x52, 0x39, 0x3c, 0x38, 0x38, 0x38, 0xc4, 0x16, 0x86, 0x87, 0x04, 0x2a, 0xe0, 0x1e, 0x0a, 0xfc, 0x4a, 0xc5, 0xed, 0x1d, 0x1c, 0xd0, 0x5e, 0xe5, 0x2e, 0xe0, 0x1f, 0xd2, 0x1e, 0x81, 0x4a, 0x0f, 0x01, 0xff, 0x50, 0xe0, 0xd7, 0x6a, 0xb5, 0xfb, 0xc7, 0xc7, 0xc7, 0xf7, 0xb1, 0x85, 0x21, 0xab, 0x44, 0x21, 0xd8, 0x22, 0x7e, 0xad, 0xe6, 0xf6, 0x8e, 0x8f, 0x69, 0xaf, 0x76, 0x0f, 0xf0, 0xef, 0x03, 0xcd, 0xfb, 0x94, 0x2a, 0x50, 0xb1, 0x7d, 0xff, 0xe8, 0x28, 0x7d, 0x84, 0xe5, 0xf2, 0x07, 0x47, 0x47, 0xe5, 0xf2, 0xd1, 0xe5, 0x72, 0xf9, 0x03, 0x1c, 0xc2, 0xcf, 0xe5, 0x62, 0xb9, 0x7c, 0xd6, 0x83, 0xb3, 0x79, 0x80, 0xb3, 0x75, 0x31, 0xf8, 0x07, 0x02, 0x5f, 0xb4, 0x30, 0x0e, 0xc1, 0x2f, 0x0b, 0xfa, 0x97, 0x05, 0xfe, 0xe5, 0x3e, 0xfe, 0x6f, 0x8f, 0x8f, 0x9f, 0x3f, 0xbe, 0x79, 0xef, 0xf8, 0xf8, 0xde, 0x4d, 0x5e, 0x6b, 0x35, 0xd6, 0xc2, 0xcc, 0xcd, 0xeb, 0xb5, 0xda, 0xb3, 0x3f, 0x35, 0xcd, 0x2f, 0x98, 0x03, 0xba, 0x69, 0xea, 0x2f, 0x98, 0xc1, 0x16, 0x7a, 0x2f, 0x5c, 0x1c, 0x18, 0x38, 0xf3, 0xce, 0xfe, 0xfe, 0x73, 0xfb, 0xef, 0x66, 0xf6, 0x59, 0xcd, 0xbc, 0xbb, 0xef, 0xf5, 0xa1, 0x97, 0x51, 0x07, 0x07, 0x9f, 0xf9, 0xc5, 0xc1, 0x41, 0xea, 0xe0, 0xee, 0xec, 0x01, 0xab, 0xb3, 0x15, 0xd0, 0x32, 0xb6, 0x77, 0x0f, 0xee, 0xc2, 0xef, 0x8f, 0x2a, 0x95, 0x73, 0xcc, 0xde, 0x68, 0x7b, 0xf6, 0xfd, 0x87, 0xf5, 0x47, 0xc0, 0x0f, 0x5c, 0x85, 0xa2, 0x6e, 0x3f, 0x71, 0xef, 0x28, 0x2e, 0xd8, 0xfe, 0xc1, 0x1d, 0xb0, 0xff, 0xbe, 0xa8, 0xe8, 0x0f, 0x0a, 0x7d, 0xd0, 0x73, 0xdd, 0x5e, 0x8f, 0xd9, 0x1b, 0x6d, 0x6f, 0x3e, 0x84, 0x16, 0x3f, 0xd3, 0x7c, 0x09, 0xfc, 0xc0, 0xc7, 0xb7, 0x28, 0x05, 0xdb, 0xb3, 0x6a, 0x99, 0xd4, 0x65, 0x7e, 0x30, 0xd0, 0xc7, 0x67, 0xf6, 0x46, 0xdb, 0x3f, 0x7a, 0xf4, 0xe8, 0xf0, 0xe0, 0xf0, 0x10, 0xfb, 0x8b, 0xe0, 0x07, 0x3e, 0xfe, 0x21, 0xa5, 0x60, 0x7b, 0xfa, 0x08, 0xea, 0xe1, 0x01, 0x75, 0x99, 0x1f, 0x54, 0xfa, 0xf8, 0xcc, 0xd6, 0x68, 0xfb, 0x63, 0x6c, 0x3f, 0x66, 0xfd, 0x55, 0xf0, 0x03, 0x1f, 0xff, 0xbe, 0xe2, 0x82, 0xed, 0x1f, 0xdc, 0x07, 0xfb, 0x1f, 0x8b, 0x8a, 0xfe, 0xe0, 0xe1, 0x2b, 0x50, 0x92, 0x7c, 0x00, 0xe7, 0x83, 0xf0, 0xa8, 0x0f, 0x84, 0xe1, 0x71, 0x1f, 0x08, 0xc1, 0x25, 0x3e, 0xe0, 0xc1, 0x93, 0x7c, 0x00, 0xe7, 0x11, 0x9e, 0xe4, 0x03, 0x38, 0x8f, 0xf0, 0x24, 0x1f, 0xc0, 0x79, 0x84, 0x27, 0xf9, 0x00, 0xce, 0x4b, 0xe3, 0x97, 0x15, 0xd3, 0xb2, 0xdc, 0x87, 0xd1, 0xf8, 0x75, 0xd1, 0x9e, 0x16, 0xda, 0x14, 0xea, 0x43, 0xa8, 0x8a, 0x72, 0x71, 0x00, 0xfe, 0x0d, 0x28, 0x80, 0x7b, 0x51, 0xd4, 0x50, 0x81, 0xfd, 0xf1, 0x07, 0x5c, 0x15, 0x97, 0x78, 0xf5, 0x8c, 0x57, 0xdf, 0xac, 0xf5, 0x7a, 0xf7, 0x3e, 0xfe, 0x77, 0xef, 0xde, 0x31, 0xaf, 0x38, 0x0e, 0x16, 0xe5, 0xb4, 0x7c, 0xa6, 0xa5, 0x1f, 0xbf, 0xd8, 0x3e, 0x74, 0xe3, 0xf1, 0xab, 0x60, 0xcc, 0x3e, 0x80, 0xd8, 0x65, 0x3e, 0x10, 0x8d, 0x5f, 0xcf, 0xcc, 0x9e, 0xed, 0x99, 0x81, 0xd1, 0x1f, 0xd0, 0x2f, 0x98, 0xed, 0x7d, 0x5b, 0x0b, 0xdb, 0x9f, 0xe1, 0xfe, 0x20, 0xf6, 0xff, 0x61, 0xb9, 0xd7, 0x73, 0xb6, 0xff, 0xe5, 0x57, 0x1c, 0x07, 0xcb, 0x33, 0x1f, 0xbe, 0x74, 0x6a, 0xa4, 0xd3, 0x72, 0x5a, 0x4e, 0x4b, 0x72, 0x71, 0x03, 0x55, 0x09, 0xb4, 0xa2, 0xe0, 0x29, 0x85, 0x35, 0xa9, 0x20, 0xcc, 0x75, 0x49, 0xa8, 0x0d, 0xc1, 0x61, 0x8e, 0x10, 0x6c, 0x61, 0x00, 0x1d, 0x37, 0x42, 0x1f, 0xa0, 0x00, 0x64, 0x1d, 0xd1, 0x90, 0x30, 0x3e, 0x47, 0x53, 0x28, 0xfc, 0x10, 0xca, 0xdb, 0x08, 0x01, 0x85, 0x9e, 0x24, 0x9f, 0x80, 0x7b, 0x35, 0x42, 0xbe, 0x3f, 0x47, 0x12, 0x68, 0x11, 0xdc, 0x9f, 0x30, 0xfe, 0xb1, 0x8d, 0xe2, 0xfb, 0x7b, 0xb8, 0x8a, 0x1c, 0x16, 0xdc, 0x8b, 0x24, 0xf3, 0x4b, 0xdd, 0xc7, 0x9b, 0x8a, 0x12, 0x41, 0x43, 0x26, 0x60, 0xbf, 0x89, 0xd1, 0x75, 0x61, 0xd6, 0xab, 0xb1, 0x7d, 0x5c, 0xb1, 0xb7, 0xeb, 0xf5, 0xc3, 0x14, 0x98, 0xbd, 0x28, 0x11, 0x74, 0xb8, 0x8d, 0xc3, 0x70, 0xc1, 0x14, 0xea, 0x87, 0x26, 0xd3, 0x77, 0xa9, 0xb7, 0x56, 0x89, 0xe1, 0xbb, 0x81, 0x7d, 0xa2, 0xfe, 0xd1, 0xdf, 0x57, 0x91, 0xf2, 0x1f, 0xdc, 0x5f, 0Line truncated

src/config.c

@@ -86,6 +86,16 @@ static void readConfigCrtMonitor(Config* config, lua_State* lua)
 	lua_pop(lua, 1);
 }
 
+static void readConfigUiScale(Config* config, lua_State* lua)
+{
+	lua_getglobal(lua, "UI_SCALE");
+
+	if(lua_isinteger(lua, -1))
+		config->data.uiScale = lua_tointeger(lua, -1);
+
+	lua_pop(lua, 1);
+}
+
 static void readConfigCrtShader(Config* config, lua_State* lua)
 {
 	lua_getglobal(lua, "CRT_SHADER");
@@ -277,6 +287,7 @@ static void readConfig(Config* config)
 			readConfigNoSound(config, lua);
 			readConfigShowSync(config, lua);
 			readConfigCrtMonitor(config, lua);
+			readConfigUiScale(config, lua);
 			readTheme(config, lua);
 		}
 

src/console.c

@@ -3089,6 +3089,24 @@ static bool cmdInjectMap(Console* console, const char* param, const char* name)
 	return done;
 }
 
+static bool checkUIScale(Console* console, const char* param, const char* value)
+{
+	bool done = false;
+
+	if(strcmp(param, "-uiscale") == 0)
+	{
+		s32 scale = atoi(value);
+
+		if(scale > 0)
+		{
+			console->config->data.uiScale = scale;
+			done = true;
+		}
+	}
+
+	return done;
+}
+
 void initConsole(Console* console, tic_mem* tic, FileSystem* fs, Config* config, s32 argc, char **argv)
 {
 	if(!console->buffer) console->buffer = malloc(BufferSize(tic));
@@ -3191,7 +3209,8 @@ void initConsole(Console* console, tic_mem* tic, FileSystem* fs, Config* config,
 
 				if(cmdInjectCode(console, first, second)
 					|| cmdInjectSprites(console, first, second)
-					|| cmdInjectMap(console, first, second))
+					|| cmdInjectMap(console, first, second)
+					|| checkUIScale(console, first, second))
 					argp |= mask;
 			}
 		}

src/menu.c

@@ -24,7 +24,7 @@
 #include "fs.h"
 
 #define DIALOG_WIDTH (TIC80_WIDTH/2)
-#define DIALOG_HEIGHT (TIC80_HEIGHT/2-TOOLBAR_SIZE)
+#define DIALOG_HEIGHT (TIC80_HEIGHT/2)
 
 static const char* Rows[] = 
 {
@@ -32,7 +32,8 @@ static const char* Rows[] =
 	"RESET GAME",
 	"GAMEPAD CONFIG",
 	"",
-	"EXIT TO TIC-80",
+	"CLOSE GAME",
+	"QUIT TIC-80",
 };
 
 static void resumeGame(Menu* menu)
@@ -56,12 +57,12 @@ static void gamepadConfig(Menu* menu)
 	menu->gamepad.tab = 0;
 }
 
-static void exitToTIC(Menu* menu)
+static void closeGame(Menu* menu)
 {
 	exitFromGameMenu();
 }
 
-static void(*const MenuHandlers[])(Menu*) = {resumeGame, resetGame, gamepadConfig, NULL, exitToTIC};
+static void(*const MenuHandlers[])(Menu*) = {resumeGame, resetGame, gamepadConfig, NULL, closeGame, exitStudio};
 
 static tic_rect getRect(Menu* menu)
 {
@@ -252,7 +253,7 @@ static void drawGamepadMenu(Menu* menu)
 
 	static const char Label[] = "BACK";
 
-	tic_rect rect = {dlgRect.x + 25, dlgRect.y + 49, (sizeof(Label)-1)*tic->font.width, tic->font.height};
+	tic_rect rect = {dlgRect.x + 25, dlgRect.y + 56, (sizeof(Label)-1)*tic->font.width, tic->font.height};
 
 	bool over = false;
 	bool down = false;

src/system.c

@@ -12,7 +12,6 @@
 #include <emscripten.h>
 #endif
 
-#define STUDIO_UI_SCALE 3
 #define STUDIO_PIXEL_FORMAT GPU_FORMAT_RGBA
 #define TEXTURE_SIZE (TIC80_FULLWIDTH)
 #define OFFSET_LEFT ((TIC80_FULLWIDTH-TIC80_WIDTH)/2)
@@ -1180,7 +1179,8 @@ static s32 start(s32 argc, char **argv, const char* folder)
 
 	platform.studio = studioInit(argc, argv, platform.audio.spec.freq, folder, &systemInterface);
 
-	enum{Width = TIC80_FULLWIDTH * STUDIO_UI_SCALE, Height = TIC80_FULLHEIGHT * STUDIO_UI_SCALE};
+	const s32 Width = TIC80_FULLWIDTH * platform.studio->config()->uiScale;
+	const s32 Height = TIC80_FULLHEIGHT * platform.studio->config()->uiScale;
 
 	platform.window = SDL_CreateWindow( TIC_TITLE, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
 		Width, Height, SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE| SDL_WINDOW_OPENGL);

src/system.h

@@ -82,6 +82,8 @@ typedef struct
 	const char* crtShader;
 	const tic_cartridge* cart;
 
+	s32 uiScale;
+
 } StudioConfig;
 
 typedef struct