mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Close #14253: Replace font size tokens with adjusted DrawText calls

This commit is contained in:
Geoff B 2021-03-27 07:40:17 -06:00 committed by GitHub
parent 713410ab6c
commit 6c8493cb69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 178 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

278
data/language/en-GB.txt
View File

@ -798,14 +798,14 @@ STR_1410 :Vertical Tower
STR_1411 :{STRINGID} in the way
STR_1412 :{WINDOW_COLOUR_3}Data logging not available for this type of ride
STR_1413 :{WINDOW_COLOUR_3}Data logging will start when next {STRINGID} leaves {STRINGID}
STR_1414 :{SMALLFONT}{BLACK}{DURATION}
STR_1414 :{BLACK}{DURATION}
STR_1415 :{WINDOW_COLOUR_2}Velocity
STR_1416 :{WINDOW_COLOUR_2}Altitude
STR_1417 :{WINDOW_COLOUR_2}Vert. Gs
STR_1418 :{WINDOW_COLOUR_2}Lat. Gs
STR_1419 :{SMALLFONT}{BLACK}{VELOCITY}
STR_1420 :{SMALLFONT}{BLACK}{LENGTH}
STR_1421 :{SMALLFONT}{BLACK}{COMMA16}g
STR_1419 :{BLACK}{VELOCITY}
STR_1420 :{BLACK}{LENGTH}
STR_1421 :{BLACK}{COMMA16}g
STR_1422 :Logging data from {POP16}{STRINGID}
STR_1423 :Queue line path
STR_1424 :Footpath
@ -864,131 +864,131 @@ STR_1476 :{WINDOW_COLOUR_2}Intensity rating: {BLACK}Not yet available
STR_1477 :{WINDOW_COLOUR_2}Intensity rating: {OUTLINE}{RED}{COMMA2DP32} ({STRINGID})
STR_1478 :{WINDOW_COLOUR_2}Nausea rating: {BLACK}{COMMA2DP32} ({STRINGID})
STR_1479 :{WINDOW_COLOUR_2}Nausea rating: {BLACK}Not yet available
STR_1480 :{SMALLFONT}“I can’t afford {STRINGID}”
STR_1481 :{SMALLFONT}“I’ve spent all my money”
STR_1482 :{SMALLFONT}“I feel sick”
STR_1483 :{SMALLFONT}“I feel very sick”
STR_1484 :{SMALLFONT}“I want to go on something more thrilling than {STRINGID}”
STR_1485 :{SMALLFONT}“{STRINGID} looks too intense for me”
STR_1486 :{SMALLFONT}“I haven’t finished my {STRINGID} yet”
STR_1487 :{SMALLFONT}“Just looking at {STRINGID} makes me feel sick”
STR_1488 :{SMALLFONT}“I’m not paying that much to go on {STRINGID}”
STR_1489 :{SMALLFONT}“I want to go home”
STR_1490 :{SMALLFONT}“{STRINGID} is really good value”
STR_1491 :{SMALLFONT}“I’ve already got {STRINGID}”
STR_1492 :{SMALLFONT}“I can’t afford {STRINGID}”
STR_1493 :{SMALLFONT}“I’m not hungry”
STR_1494 :{SMALLFONT}“I’m not thirsty”
STR_1495 :{SMALLFONT}“Help! I’m drowning!”
STR_1496 :{SMALLFONT}“I’m lost!”
STR_1497 :{SMALLFONT}“{STRINGID} was great”
STR_1498 :{SMALLFONT}“I’ve been queuing for {STRINGID} for ages”
STR_1499 :{SMALLFONT}“I’m tired”
STR_1500 :{SMALLFONT}“I’m hungry”
STR_1501 :{SMALLFONT}“I’m thirsty”
STR_1502 :{SMALLFONT}“I need to go to the toilet”
STR_1503 :{SMALLFONT}“I can’t find {STRINGID}”
STR_1504 :{SMALLFONT}“I’m not paying that much to use {STRINGID}”
STR_1505 :{SMALLFONT}“I’m not going on {STRINGID} while it’s raining”
STR_1506 :{SMALLFONT}“The litter here is really bad”
STR_1507 :{SMALLFONT}“I can’t find the park exit”
STR_1508 :{SMALLFONT}“I want to get off {STRINGID}”
STR_1509 :{SMALLFONT}“I want to get out of {STRINGID}”
STR_1510 :{SMALLFONT}“I’m not going on {STRINGID} - it isn’t safe”
STR_1511 :{SMALLFONT}“This path is disgusting”
STR_1512 :{SMALLFONT}“It’s too crowded here”
STR_1513 :{SMALLFONT}“The vandalism here is really bad”
STR_1514 :{SMALLFONT}“Great scenery!”
STR_1515 :{SMALLFONT}“This park is really clean and tidy”
STR_1516 :{SMALLFONT}“The jumping fountains are great”
STR_1517 :{SMALLFONT}“The music is nice here”
STR_1518 :{SMALLFONT}“This balloon from {STRINGID} is really good value”
STR_1519 :{SMALLFONT}“This cuddly toy from {STRINGID} is really good value”
STR_1520 :{SMALLFONT}“This park map from {STRINGID} is really good value”
STR_1521 :{SMALLFONT}“This on-ride photo from {STRINGID} is really good value”
STR_1522 :{SMALLFONT}“This umbrella from {STRINGID} is really good value”
STR_1523 :{SMALLFONT}“This drink from {STRINGID} is really good value”
STR_1524 :{SMALLFONT}“This burger from {STRINGID} is really good value”
STR_1525 :{SMALLFONT}“These chips from {STRINGID} are really good value”
STR_1526 :{SMALLFONT}“This ice cream from {STRINGID} is really good value”
STR_1527 :{SMALLFONT}“This candyfloss from {STRINGID} is really good value”
STR_1480 :“I can’t afford {STRINGID}”
STR_1481 :“I’ve spent all my money”
STR_1482 :“I feel sick”
STR_1483 :“I feel very sick”
STR_1484 :“I want to go on something more thrilling than {STRINGID}”
STR_1485 :“{STRINGID} looks too intense for me”
STR_1486 :“I haven’t finished my {STRINGID} yet”
STR_1487 :“Just looking at {STRINGID} makes me feel sick”
STR_1488 :“I’m not paying that much to go on {STRINGID}”
STR_1489 :“I want to go home”
STR_1490 :“{STRINGID} is really good value”
STR_1491 :“I’ve already got {STRINGID}”
STR_1492 :“I can’t afford {STRINGID}”
STR_1493 :“I’m not hungry”
STR_1494 :“I’m not thirsty”
STR_1495 :“Help! I’m drowning!”
STR_1496 :“I’m lost!”
STR_1497 :“{STRINGID} was great”
STR_1498 :“I’ve been queuing for {STRINGID} for ages”
STR_1499 :“I’m tired”
STR_1500 :“I’m hungry”
STR_1501 :“I’m thirsty”
STR_1502 :“I need to go to the toilet”
STR_1503 :“I can’t find {STRINGID}”
STR_1504 :“I’m not paying that much to use {STRINGID}”
STR_1505 :“I’m not going on {STRINGID} while it’s raining”
STR_1506 :“The litter here is really bad”
STR_1507 :“I can’t find the park exit”
STR_1508 :“I want to get off {STRINGID}”
STR_1509 :“I want to get out of {STRINGID}”
STR_1510 :“I’m not going on {STRINGID} - it isn’t safe”
STR_1511 :“This path is disgusting”
STR_1512 :“It’s too crowded here”
STR_1513 :“The vandalism here is really bad”
STR_1514 :“Great scenery!”
STR_1515 :“This park is really clean and tidy”
STR_1516 :“The jumping fountains are great”
STR_1517 :“The music is nice here”
STR_1518 :“This balloon from {STRINGID} is really good value”
STR_1519 :“This cuddly toy from {STRINGID} is really good value”
STR_1520 :“This park map from {STRINGID} is really good value”
STR_1521 :“This on-ride photo from {STRINGID} is really good value”
STR_1522 :“This umbrella from {STRINGID} is really good value”
STR_1523 :“This drink from {STRINGID} is really good value”
STR_1524 :“This burger from {STRINGID} is really good value”
STR_1525 :“These chips from {STRINGID} are really good value”
STR_1526 :“This ice cream from {STRINGID} is really good value”
STR_1527 :“This candyfloss from {STRINGID} is really good value”
STR_1528 :
STR_1529 :
STR_1530 :
STR_1531 :{SMALLFONT}“This pizza from {STRINGID} is really good value”
STR_1531 :“This pizza from {STRINGID} is really good value”
STR_1532 :
STR_1533 :{SMALLFONT}“This popcorn from {STRINGID} is really good value”
STR_1534 :{SMALLFONT}“This hot dog from {STRINGID} is really good value”
STR_1535 :{SMALLFONT}“This tentacle from {STRINGID} is really good value”
STR_1536 :{SMALLFONT}“This hat from {STRINGID} is really good value”
STR_1537 :{SMALLFONT}“This toffee apple from {STRINGID} is really good value”
STR_1538 :{SMALLFONT}“This T-shirt from {STRINGID} is really good value”
STR_1539 :{SMALLFONT}“This doughnut from {STRINGID} is really good value”
STR_1540 :{SMALLFONT}“This coffee from {STRINGID} is really good value”
STR_1533 :“This popcorn from {STRINGID} is really good value”
STR_1534 :“This hot dog from {STRINGID} is really good value”
STR_1535 :“This tentacle from {STRINGID} is really good value”
STR_1536 :“This hat from {STRINGID} is really good value”
STR_1537 :“This toffee apple from {STRINGID} is really good value”
STR_1538 :“This T-shirt from {STRINGID} is really good value”
STR_1539 :“This doughnut from {STRINGID} is really good value”
STR_1540 :“This coffee from {STRINGID} is really good value”
STR_1541 :
STR_1542 :{SMALLFONT}“This fried chicken from {STRINGID} is really good value”
STR_1543 :{SMALLFONT}“This lemonade from {STRINGID} is really good value”
STR_1542 :“This fried chicken from {STRINGID} is really good value”
STR_1543 :“This lemonade from {STRINGID} is really good value”
STR_1544 :
STR_1545 :
STR_1546 :
STR_1547 :
STR_1548 :
STR_1549 :
STR_1550 :{SMALLFONT}“Wow!”
STR_1551 :{SMALLFONT}“I have the strangest feeling someone is watching me”
STR_1552 :{SMALLFONT}“I’m not paying that much for a balloon from {STRINGID}”
STR_1553 :{SMALLFONT}“I’m not paying that much for a cuddly toy from {STRINGID}”
STR_1554 :{SMALLFONT}“I’m not paying that much for a park map from {STRINGID}”
STR_1555 :{SMALLFONT}“I’m not paying that much for an on-ride photo from {STRINGID}”
STR_1556 :{SMALLFONT}“I’m not paying that much for an umbrella from {STRINGID}”
STR_1557 :{SMALLFONT}“I’m not paying that much for a drink from {STRINGID}”
STR_1558 :{SMALLFONT}“I’m not paying that much for a burger from {STRINGID}”
STR_1559 :{SMALLFONT}“I’m not paying that much for chips from {STRINGID}”
STR_1560 :{SMALLFONT}“I’m not paying that much for an ice cream from {STRINGID}”
STR_1561 :{SMALLFONT}“I’m not paying that much for candyfloss from {STRINGID}”
STR_1550 :“Wow!”
STR_1551 :“I have the strangest feeling someone is watching me”
STR_1552 :“I’m not paying that much for a balloon from {STRINGID}”
STR_1553 :“I’m not paying that much for a cuddly toy from {STRINGID}”
STR_1554 :“I’m not paying that much for a park map from {STRINGID}”
STR_1555 :“I’m not paying that much for an on-ride photo from {STRINGID}”
STR_1556 :“I’m not paying that much for an umbrella from {STRINGID}”
STR_1557 :“I’m not paying that much for a drink from {STRINGID}”
STR_1558 :“I’m not paying that much for a burger from {STRINGID}”
STR_1559 :“I’m not paying that much for chips from {STRINGID}”
STR_1560 :“I’m not paying that much for an ice cream from {STRINGID}”
STR_1561 :“I’m not paying that much for candyfloss from {STRINGID}”
STR_1562 :
STR_1563 :
STR_1564 :
STR_1565 :{SMALLFONT}“I’m not paying that much for pizza from {STRINGID}”
STR_1565 :“I’m not paying that much for pizza from {STRINGID}”
STR_1566 :
STR_1567 :{SMALLFONT}“I’m not paying that much for popcorn from {STRINGID}”
STR_1568 :{SMALLFONT}“I’m not paying that much for a hot dog from {STRINGID}”
STR_1569 :{SMALLFONT}“I’m not paying that much for tentacle from {STRINGID}”
STR_1570 :{SMALLFONT}“I’m not paying that much for a hat from {STRINGID}”
STR_1571 :{SMALLFONT}“I’m not paying that much for a toffee apple from {STRINGID}”
STR_1572 :{SMALLFONT}“I’m not paying that much for a T-shirt from {STRINGID}”
STR_1573 :{SMALLFONT}“I’m not paying that much for a doughnut from {STRINGID}”
STR_1574 :{SMALLFONT}“I’m not paying that much for coffee from {STRINGID}”
STR_1567 :“I’m not paying that much for popcorn from {STRINGID}”
STR_1568 :“I’m not paying that much for a hot dog from {STRINGID}”
STR_1569 :“I’m not paying that much for tentacle from {STRINGID}”
STR_1570 :“I’m not paying that much for a hat from {STRINGID}”
STR_1571 :“I’m not paying that much for a toffee apple from {STRINGID}”
STR_1572 :“I’m not paying that much for a T-shirt from {STRINGID}”
STR_1573 :“I’m not paying that much for a doughnut from {STRINGID}”
STR_1574 :“I’m not paying that much for coffee from {STRINGID}”
STR_1575 :
STR_1576 :{SMALLFONT}“I’m not paying that much for fried chicken from {STRINGID}”
STR_1577 :{SMALLFONT}“I’m not paying that much for lemonade from {STRINGID}”
STR_1576 :“I’m not paying that much for fried chicken from {STRINGID}”
STR_1577 :“I’m not paying that much for lemonade from {STRINGID}”
STR_1578 :
STR_1579 :
STR_1580 :
STR_1581 :
STR_1582 :
STR_1583 :
STR_1584 :{SMALLFONT}“This on-ride photo from {STRINGID} is really good value”
STR_1585 :{SMALLFONT}“This on-ride photo from {STRINGID} is really good value”
STR_1586 :{SMALLFONT}“This on-ride photo from {STRINGID} is really good value”
STR_1587 :{SMALLFONT}“This pretzel from {STRINGID} is really good value”
STR_1588 :{SMALLFONT}“This hot chocolate from {STRINGID} is really good value”
STR_1589 :{SMALLFONT}“This iced tea from {STRINGID} is really good value”
STR_1590 :{SMALLFONT}“This funnel cake from {STRINGID} is really good value”
STR_1591 :{SMALLFONT}“These sunglasses from {STRINGID} are really good value”
STR_1592 :{SMALLFONT}“These beef noodles from {STRINGID} are really good value”
STR_1593 :{SMALLFONT}“These fried rice noodles from {STRINGID} are really good value”
STR_1594 :{SMALLFONT}“This wonton soup from {STRINGID} is really good value”
STR_1595 :{SMALLFONT}“This meatball soup from {STRINGID} is really good value”
STR_1596 :{SMALLFONT}“This fruit juice from {STRINGID} is really good value”
STR_1597 :{SMALLFONT}“This soybean milk from {STRINGID} is really good value”
STR_1598 :{SMALLFONT}“This sujeonggwa from {STRINGID} is really good value”
STR_1599 :{SMALLFONT}“This sub sandwich from {STRINGID} is really good value”
STR_1600 :{SMALLFONT}“This cookie from {STRINGID} is really good value”
STR_1584 :“This on-ride photo from {STRINGID} is really good value”
STR_1585 :“This on-ride photo from {STRINGID} is really good value”
STR_1586 :“This on-ride photo from {STRINGID} is really good value”
STR_1587 :“This pretzel from {STRINGID} is really good value”
STR_1588 :“This hot chocolate from {STRINGID} is really good value”
STR_1589 :“This iced tea from {STRINGID} is really good value”
STR_1590 :“This funnel cake from {STRINGID} is really good value”
STR_1591 :“These sunglasses from {STRINGID} are really good value”
STR_1592 :“These beef noodles from {STRINGID} are really good value”
STR_1593 :“These fried rice noodles from {STRINGID} are really good value”
STR_1594 :“This wonton soup from {STRINGID} is really good value”
STR_1595 :“This meatball soup from {STRINGID} is really good value”
STR_1596 :“This fruit juice from {STRINGID} is really good value”
STR_1597 :“This soybean milk from {STRINGID} is really good value”
STR_1598 :“This sujeonggwa from {STRINGID} is really good value”
STR_1599 :“This sub sandwich from {STRINGID} is really good value”
STR_1600 :“This cookie from {STRINGID} is really good value”
STR_1601 :
STR_1602 :
STR_1603 :
STR_1604 :{SMALLFONT}“This roast sausage from {STRINGID} is really good value”
STR_1604 :“This roast sausage from {STRINGID} is really good value”
STR_1605 :
STR_1606 :
STR_1607 :
@ -1000,27 +1000,27 @@ STR_1612 :
STR_1613 :
STR_1614 :
STR_1615 :
STR_1616 :{SMALLFONT}“I’m not paying that much for an on-ride photo from {STRINGID}”
STR_1617 :{SMALLFONT}“I’m not paying that much for an on-ride photo from {STRINGID}”
STR_1618 :{SMALLFONT}“I’m not paying that much for an on-ride photo from {STRINGID}”
STR_1619 :{SMALLFONT}“I’m not paying that much for a pretzel from {STRINGID}”
STR_1620 :{SMALLFONT}“I’m not paying that much for hot chocolate from {STRINGID}”
STR_1621 :{SMALLFONT}“I’m not paying that much for iced tea from {STRINGID}”
STR_1622 :{SMALLFONT}“I’m not paying that much for a funnel cake from {STRINGID}”
STR_1623 :{SMALLFONT}“I’m not paying that much for sunglasses from {STRINGID}”
STR_1624 :{SMALLFONT}“I’m not paying that much for beef noodles from {STRINGID}”
STR_1625 :{SMALLFONT}“I’m not paying that much for fried rice noodles from {STRINGID}”
STR_1626 :{SMALLFONT}“I’m not paying that much for wonton soup from {STRINGID}”
STR_1627 :{SMALLFONT}“I’m not paying that much for meatball soup from {STRINGID}”
STR_1628 :{SMALLFONT}“I’m not paying that much for fruit juice from {STRINGID}”
STR_1629 :{SMALLFONT}“I’m not paying that much for soybean milk from {STRINGID}”
STR_1630 :{SMALLFONT}“I’m not paying that much for sujeonggwa from {STRINGID}”
STR_1631 :{SMALLFONT}“I’m not paying that much for a sub sandwich from {STRINGID}”
STR_1632 :{SMALLFONT}“I’m not paying that much for a cookie from {STRINGID}”
STR_1616 :“I’m not paying that much for an on-ride photo from {STRINGID}”
STR_1617 :“I’m not paying that much for an on-ride photo from {STRINGID}”
STR_1618 :“I’m not paying that much for an on-ride photo from {STRINGID}”
STR_1619 :“I’m not paying that much for a pretzel from {STRINGID}”
STR_1620 :“I’m not paying that much for hot chocolate from {STRINGID}”
STR_1621 :“I’m not paying that much for iced tea from {STRINGID}”
STR_1622 :“I’m not paying that much for a funnel cake from {STRINGID}”
STR_1623 :“I’m not paying that much for sunglasses from {STRINGID}”
STR_1624 :“I’m not paying that much for beef noodles from {STRINGID}”
STR_1625 :“I’m not paying that much for fried rice noodles from {STRINGID}”
STR_1626 :“I’m not paying that much for wonton soup from {STRINGID}”
STR_1627 :“I’m not paying that much for meatball soup from {STRINGID}”
STR_1628 :“I’m not paying that much for fruit juice from {STRINGID}”
STR_1629 :“I’m not paying that much for soybean milk from {STRINGID}”
STR_1630 :“I’m not paying that much for sujeonggwa from {STRINGID}”
STR_1631 :“I’m not paying that much for a sub sandwich from {STRINGID}”
STR_1632 :“I’m not paying that much for a cookie from {STRINGID}”
STR_1633 :
STR_1634 :
STR_1635 :
STR_1636 :{SMALLFONT}“I’m not paying that much for a roast sausage from {STRINGID}”
STR_1636 :“I’m not paying that much for a roast sausage from {STRINGID}”
STR_1637 :
STR_1638 :
STR_1639 :
@ -1032,10 +1032,10 @@ STR_1644 :
STR_1645 :
STR_1646 :
STR_1647 :
STR_1648 :{SMALLFONT}“Help! Put me down!”
STR_1649 :{SMALLFONT}“I’m running out of cash!”
STR_1650 :{SMALLFONT}“Wow! A new ride being built!”
STR_1653 :{SMALLFONT}“…and here we are on {STRINGID}!”
STR_1648 :“Help! Put me down!”
STR_1649 :“I’m running out of cash!”
STR_1650 :“Wow! A new ride being built!”
STR_1653 :“…and here we are on {STRINGID}!”
STR_1654 :{WINDOW_COLOUR_2}Recent thoughts:
STR_1655 :Construct footpath on land
STR_1656 :Construct bridge or tunnel footpath
@ -1187,7 +1187,7 @@ STR_1808 :{WINDOW_COLOUR_2}Last breakdown: {BLACK}{STRINGID}
STR_1809 :{WINDOW_COLOUR_2}Current breakdown: {OUTLINE}{RED}{STRINGID}
STR_1810 :{WINDOW_COLOUR_2}Carrying:
STR_1811 :Can’t build this here…
STR_1812 :{SMALLFONT}{BLACK}{STRINGID}
STR_1812 :{BLACK}{STRINGID}
STR_1813 :Miscellaneous Objects
STR_1814 :Actions
STR_1815 :Thoughts
@ -1196,7 +1196,7 @@ STR_1817 :({COMMA32})
STR_1818 :{WINDOW_COLOUR_2}All guests
STR_1819 :{WINDOW_COLOUR_2}All guests (summarised)
STR_1820 :{WINDOW_COLOUR_2}Guests {STRINGID}
STR_1821 :{WINDOW_COLOUR_2}Guests thinking {STRINGID}
STR_1821 :{WINDOW_COLOUR_2}Guests thinking {SMALLFONT}{STRINGID}
STR_1822 :{WINDOW_COLOUR_2}Guests thinking about {POP16}{STRINGID}
STR_1823 :Show guests’ thoughts about this ride/attraction
STR_1824 :Show guests on this ride/attraction
@ -1297,7 +1297,6 @@ STR_1921 :Start a new game
STR_1922 :Continue playing a saved game
STR_1924 :Exit
STR_1925 :Can’t place person here…
STR_1926 :{SMALLFONT}
STR_1927 :{YELLOW}{STRINGID} has broken down
STR_1928 :{RED}{STRINGID} has crashed!
STR_1929 :{RED}{STRINGID} still hasn’t been fixed{NEWLINE}Check where your mechanics are and consider organizing them better
@ -1578,7 +1577,7 @@ STR_2218 :{RED}{STRINGID} on {STRINGID} hasn’t returned to the {STRINGID} y
STR_2219 :{RED}{COMMA16} people have died in an accident on {STRINGID}
STR_2220 :{WINDOW_COLOUR_2}Park Rating: {BLACK}{COMMA16}
STR_2221 :Park Rating: {COMMA16}
STR_2222 :{SMALLFONT}{BLACK}{STRINGID}
STR_2222 :{BLACK}{STRINGID}
STR_2223 :{WINDOW_COLOUR_2}Guests in park: {BLACK}{COMMA32}
STR_2224 :{WINDOW_COLOUR_2}Cash: {BLACK}{CURRENCY2DP}
STR_2225 :{WINDOW_COLOUR_2}Cash: {RED}{CURRENCY2DP}
@ -1591,7 +1590,7 @@ STR_2231 :Holding brake for drop
STR_2232 :Cable lift hill
STR_2233 :Park information
STR_2234 :Recent Messages
STR_2235 :{SMALLFONT}{STRINGID} {STRINGID}
STR_2235 :{STRINGID} {STRINGID}
STR_2236 :January
STR_2237 :February
STR_2238 :March
@ -1795,7 +1794,7 @@ STR_2450 :{YELLOW}Your advertising campaign for the park has finished
STR_2451 :{YELLOW}Your advertising campaign for {STRINGID} has finished
STR_2452 :{WINDOW_COLOUR_2}Cash (less loan): {BLACK}{CURRENCY2DP}
STR_2453 :{WINDOW_COLOUR_2}Cash (less loan): {RED}{CURRENCY2DP}
STR_2454 :{SMALLFONT}{BLACK}{CURRENCY2DP} -
STR_2454 :{BLACK}{CURRENCY2DP} -
STR_2457 :Show financial accounts
STR_2458 :Show graph of cash (less loan) over time
STR_2459 :Show graph of park value over time
@ -1905,7 +1904,6 @@ STR_2636 :NumPad /
STR_2669 :NumLock
STR_2670 :Scroll
STR_2680 :All research complete
STR_2681 :{MEDIUMFONT}{BLACK}Increases your money by {CURRENCY}
STR_2684 :Large group of guests arrive
STR_2685 :Simplex Noise Parameters
STR_2686 :Low:
@ -1992,7 +1990,7 @@ STR_2789 :{WINDOW_COLOUR_2}You have failed your objective!
STR_2790 :Enter name into scenario chart
STR_2791 :Enter name
STR_2792 :Please enter your name for the scenario chart:
STR_2793 :{SMALLFONT}(Completed by {STRINGID})
STR_2793 :(Completed by {STRINGID})
STR_2794 :{WINDOW_COLOUR_2}Completed by: {BLACK}{STRINGID}{NEWLINE}{WINDOW_COLOUR_2} with a company value of: {BLACK}{CURRENCY}
STR_2795 :Sort
STR_2796 :Sort the ride list into order using the information type displayed
@ -2499,7 +2497,7 @@ STR_5134 :Adjust larger area of land rights
STR_5135 :Buy land rights and construction rights
STR_5136 :Land rights
STR_5137 :Unlock operating limits
STR_5138 :{SMALLFONT}{WINDOW_COLOUR_2}{STRINGID}
STR_5138 :{WINDOW_COLOUR_2}{STRINGID}
STR_5139 :{WHITE}{STRINGID}
STR_5140 :Disable brakes failure
STR_5141 :Disable all breakdowns
@ -2645,7 +2643,7 @@ STR_5297 :Open park
STR_5298 :{RED}{STRINGID}
STR_5299 :{LIGHTPINK}{STRINGID}
STR_5300 :Quick fire staff
STR_5301 :{MEDIUMFONT}{BLACK}Clear your loan
STR_5301 :Clear your loan
STR_5302 :Clear loan
STR_5303 :Allow building in pause mode
STR_5304 :Title Sequence:
@ -2804,7 +2802,7 @@ STR_5481 :Themes
STR_5482 :{WINDOW_COLOUR_2}Time since last inspection: {BLACK}1 minute
STR_5483 :{BLACK}({COMMA16} weeks remaining)
STR_5484 :{BLACK}({COMMA16} week remaining)
STR_5485 :{SMALLFONT}{STRING}
STR_5485 :{STRING}
STR_5486 :{BLACK}{COMMA16}
STR_5487 :Show recent messages
STR_5489 :Show only tracked guests
@ -3309,7 +3307,7 @@ STR_6030 :Scenery picker. Click any scenery on the map to select the same pie
STR_6031 :Server Description:
STR_6032 :Server Greeting:
STR_6033 :Path to RCT1 installation:
STR_6034 :{SMALLFONT}{BLACK}{STRING}
STR_6034 :{BLACK}{STRING}
STR_6035 :Please select your RCT1 directory
STR_6036 :Clear
STR_6037 :The selected folder does not contain a valid RollerCoaster Tycoon 1 install.
@ -3454,7 +3452,7 @@ STR_6183 :Follow{MOVE_X}{87}No sprite selected
STR_6184 :Follow Sprite
STR_6185 :Select Sprite
STR_6186 :No sprite selected
STR_6187 :{MEDIUMFONT}{OUTLINE}{WINDOW_COLOUR_2}{STRING}
STR_6187 :{OUTLINE}{WINDOW_COLOUR_2}{STRING}
STR_6188 :Vomit
STR_6189 :Duck
STR_6190 :You cannot select a sprite while the main title screen is active.
@ -3604,7 +3602,7 @@ STR_6356 :Spawns ducks if park contains water
STR_6357 :Removes all ducks from the map
STR_6358 :Page {UINT16}
STR_6359 :{POP16}{POP16}Page {UINT16}
STR_6360 :{SMALLFONT}{BLACK}{COMMA32}
STR_6360 :{BLACK}{COMMA32}
STR_6361 :Enable lighting effects on rides (experimental)
STR_6362 :If enabled, vehicles for tracked rides will be lit up at night.
STR_6363 :Copied text to clipboard

7
src/openrct2-ui/interface/Graph.cpp
View File

@ -29,7 +29,9 @@ namespace Graph
// Draw month text
auto ft = Formatter();
ft.Add<uint32_t>(DateGameShortMonthNames[date_get_month((yearOver32 / 4) + MONTH_COUNT)]);
DrawTextBasic(dpi, screenCoords - ScreenCoordsXY{ 0, 10 }, STR_GRAPH_LABEL, ft, { TextAlignment::CENTRE });
DrawTextBasic(
dpi, screenCoords - ScreenCoordsXY{ 0, 10 }, STR_GRAPH_LABEL, ft,
{ FontSpriteBase::SMALL, TextAlignment::CENTRE });
// Draw month mark
gfx_fill_rect(dpi, { screenCoords, screenCoords + ScreenCoordsXY{ 0, 3 } }, PALETTE_INDEX_10);
@ -171,7 +173,8 @@ namespace Graph
// Draw month text
int32_t monthFormat = DateGameShortMonthNames[date_get_month((yearOver32 / 4) + MONTH_COUNT)];
DrawTextBasic(
dpi, screenCoords - ScreenCoordsXY{ 0, 10 }, STR_GRAPH_LABEL, &monthFormat, { TextAlignment::CENTRE });
dpi, screenCoords - ScreenCoordsXY{ 0, 10 }, STR_GRAPH_LABEL, &monthFormat,
{ FontSpriteBase::SMALL, TextAlignment::CENTRE });
// Draw month mark
gfx_fill_rect(dpi, { screenCoords, screenCoords + ScreenCoordsXY{ 0, 3 } }, PALETTE_INDEX_10);

9
src/openrct2-ui/windows/Finances.cpp
View File

@ -754,7 +754,8 @@ static void window_finances_financial_graph_paint(rct_window* w, rct_drawpixelin
money32 axisValue = axisBase << yAxisScale;
auto ft = Formatter();
ft.Add<money32>(axisValue);
DrawTextBasic(dpi, { x + 70, y }, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, ft, { TextAlignment::RIGHT });
DrawTextBasic(
dpi, { x + 70, y }, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, ft, { FontSpriteBase::SMALL, TextAlignment::RIGHT });
gfx_fill_rect_inset(dpi, x + 70, y + 5, graphLeft + 482, y + 5, w->colours[2], INSET_RECT_FLAG_BORDER_INSET);
y += 39;
}
@ -859,7 +860,8 @@ static void window_finances_park_value_graph_paint(rct_window* w, rct_drawpixeli
money32 axisValue = axisBase << yAxisScale;
auto ft = Formatter();
ft.Add<money32>(axisValue);
DrawTextBasic(dpi, { x + 70, y }, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, ft, { TextAlignment::RIGHT });
DrawTextBasic(
dpi, { x + 70, y }, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, ft, { FontSpriteBase::SMALL, TextAlignment::RIGHT });
gfx_fill_rect_inset(dpi, x + 70, y + 5, graphLeft + 482, y + 5, w->colours[2], INSET_RECT_FLAG_BORDER_INSET);
y += 39;
}
@ -965,7 +967,8 @@ static void window_finances_profit_graph_paint(rct_window* w, rct_drawpixelinfo*
auto ft = Formatter();
ft.Add<money32>(axisValue);
DrawTextBasic(
dpi, screenPos + ScreenCoordsXY{ 70, 0 }, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, ft, { TextAlignment::RIGHT });
dpi, screenPos + ScreenCoordsXY{ 70, 0 }, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, ft,
{ FontSpriteBase::SMALL, TextAlignment::RIGHT });
gfx_fill_rect_inset(
dpi, screenPos.x + 70, screenPos.y + 5, graphLeft + 482, screenPos.y + 5, w->colours[2],
INSET_RECT_FLAG_BORDER_INSET);

2
src/openrct2-ui/windows/Guest.cpp
View File

@ -1008,7 +1008,7 @@ void window_guest_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
auto ft = Formatter();
peep_thought_set_format_args(&peep->Thoughts[i], ft);
DrawTextBasic(&dpi_marquee, { screenPos.x, 0 }, STR_WINDOW_COLOUR_2_STRINGID, ft, {});
DrawTextBasic(&dpi_marquee, { screenPos.x, 0 }, STR_WINDOW_COLOUR_2_STRINGID, ft, { FontSpriteBase::SMALL });
}
}

14
src/openrct2-ui/windows/GuestList.cpp
View File

@ -710,7 +710,7 @@ private:
ft = Formatter();
peep_thought_set_format_args(&thought, ft);
DrawTextEllipsised(&dpi, { 118, y }, 329, format, ft);
DrawTextEllipsised(&dpi, { 118, y }, 329, format, ft, { FontSpriteBase::SMALL });
break;
}
break;
@ -750,9 +750,17 @@ private:
{ static_cast<int32_t>(j) * 8, y + 12 });
}
// Draw action
// Draw action/thoughts
Formatter ft(group.Arguments.args);
DrawTextEllipsised(&dpi, { 0, y }, 414, format, ft);
// Draw small font if displaying guests
if (_selectedView == GuestViewType::Thoughts)
{
DrawTextEllipsised(&dpi, { 0, y }, 414, format, ft, { FontSpriteBase::SMALL });
}
else
{
DrawTextEllipsised(&dpi, { 0, y }, 414, format, ft);
}
// Draw guest count
ft = Formatter();

2
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -697,7 +697,7 @@ static void window_loadsave_paint(rct_window* w, rct_drawpixelinfo* dpi)
// Format text
thread_local std::string buffer;
buffer.assign("{MEDIUMFONT}{BLACK}");
buffer.assign("{BLACK}");
buffer += _shortenedDirectory;
// Draw path text

8
src/openrct2-ui/windows/Park.cpp
View File

@ -914,7 +914,9 @@ static void window_park_rating_paint(rct_window* w, rct_drawpixelinfo* dpi)
uint32_t axisValue = i * 200;
auto ft = Formatter();
ft.Add<uint32_t>(axisValue);
DrawTextBasic(dpi, screenPos + ScreenCoordsXY{ 10, 0 }, STR_GRAPH_AXIS_LABEL, ft, { TextAlignment::RIGHT });
DrawTextBasic(
dpi, screenPos + ScreenCoordsXY{ 10, 0 }, STR_GRAPH_AXIS_LABEL, ft,
{ FontSpriteBase::SMALL, TextAlignment::RIGHT });
gfx_fill_rect_inset(
dpi, { screenPos + ScreenCoordsXY{ 15, 5 }, screenPos + ScreenCoordsXY{ w->width - 32, 5 } }, w->colours[2],
INSET_RECT_FLAG_BORDER_INSET);
@ -1048,7 +1050,9 @@ static void window_park_guests_paint(rct_window* w, rct_drawpixelinfo* dpi)
uint32_t axisValue = i * 1000;
auto ft = Formatter();
ft.Add<uint32_t>(axisValue);
DrawTextBasic(dpi, screenPos + ScreenCoordsXY{ 10, 0 }, STR_GRAPH_AXIS_LABEL, ft, { TextAlignment::RIGHT });
DrawTextBasic(
dpi, screenPos + ScreenCoordsXY{ 10, 0 }, STR_GRAPH_AXIS_LABEL, ft,
{ FontSpriteBase::SMALL, TextAlignment::RIGHT });
gfx_fill_rect_inset(
dpi, { screenPos + ScreenCoordsXY{ 15, 5 }, screenPos + ScreenCoordsXY{ w->width - 32, 5 } }, w->colours[2],
INSET_RECT_FLAG_BORDER_INSET);

4
src/openrct2-ui/windows/Ride.cpp
View File

@ -6078,7 +6078,7 @@ static void window_ride_graphs_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi
if (listType == GRAPH_ALTITUDE)
scaled_yUnit /= 2;
DrawTextBasic(dpi, { w->scrolls[0].h_left + 1, y - 4 }, stringID, &scaled_yUnit);
DrawTextBasic(dpi, { w->scrolls[0].h_left + 1, y - 4 }, stringID, &scaled_yUnit, { FontSpriteBase::SMALL });
}
// Time marks
@ -6086,7 +6086,7 @@ static void window_ride_graphs_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi
for (int32_t x = 0; x < dpi->x + dpi->width; x += 80)
{
if (x + 80 >= dpi->x)
DrawTextBasic(dpi, { x + 2, 1 }, STR_RIDE_STATS_TIME, &time);
DrawTextBasic(dpi, { x + 2, 1 }, STR_RIDE_STATS_TIME, &time, { FontSpriteBase::SMALL });
time += 5;
}

3
src/openrct2-ui/windows/ScenarioSelect.cpp
View File

@ -628,7 +628,8 @@ static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo*
ft.Add<rct_string_id>(STR_STRING);
ft.Add<char*>(buffer);
DrawTextBasic(
dpi, { wide ? 270 : 210, y + scenarioTitleHeight + 1 }, format, ft, { TextAlignment::CENTRE });
dpi, { wide ? 270 : 210, y + scenarioTitleHeight + 1 }, format, ft,
{ FontSpriteBase::SMALL, TextAlignment::CENTRE });
}
y += scenarioItemHeight;

1
src/openrct2/localisation/FormatCodes.cpp
View File

@ -20,7 +20,6 @@ static const std::unordered_map<std::string_view, FormatToken> FormatTokenMap =
{ "NEWLINE", FormatToken::Newline, },
{ "NEWLINE_SMALLER", FormatToken::NewlineSmall, },
{ "TINYFONT", FormatToken::FontTiny, },
{ "BIGFONT", FormatToken::FontBig, },
{ "MEDIUMFONT", FormatToken::FontMedium, },
{ "SMALLFONT", FormatToken::FontSmall, },
{ "OUTLINE", FormatToken::OutlineEnable, },

1
src/openrct2/localisation/FormatCodes.h
View File

@ -70,7 +70,6 @@ enum class FormatToken
FontTiny,
FontSmall,
FontMedium,
FontBig,
OutlineEnable,
OutlineDisable,

6
src/openrct2/localisation/StringIds.h
View File

@ -1342,7 +1342,7 @@ enum
STR_CONTINUE_SAVED_GAME_TIP = 1922,
STR_EXIT = 1924,
STR_ERR_CANT_PLACE_PERSON_HERE = 1925,
// STR_1926 :{SMALLFONT} // Used in window_game_bottom_toolbar_onpaint and window_news_onscrollpaint
// STR_1926 :<removed string - do not use>
STR_RIDE_IS_BROKEN_DOWN = 1927,
STR_RIDE_HAS_CRASHED = 1928,
STR_RIDE_IS_STILL_NOT_FIXED = 1929,
@ -2004,7 +2004,7 @@ enum
// 2671--2679 unused
STR_RESEARCH_COMPLETED_AL = 2680,
STR_CHEAT_5K_MONEY_TIP = 2681,
// STR_2681 :<removed string - do not use>
// STR_2682 :<removed string - do not use>
// STR_2683 :<removed string - do not use>
STR_CHEAT_LARGE_TRAM_GUESTS_TIP = 2684,
@ -3055,8 +3055,6 @@ enum
STR_NOTIFICATION_GUEST_DIED = 5606,
STR_TILE_INSPECTOR_BASE_HEIGHT_SHORT = 5608,
STR_TILE_INSPECTOR_CLEARANGE_HEIGHT_SHORT = 5609,
// STR_5610 :{SMALLFONT}{BLACK}Remove the currently selected map element. This will forcefully remove it, so no cash will
// be used/gained. Use with caution.
STR_REMOVE_SELECTED_ELEMENT_TIP = 5610,
STR_TILE_INSPECTOR_FLAG_GHOST_SHORT = 5611,
STR_TILE_INSPECTOR_FLAG_GHOST = 5612,

4
src/openrct2/paint/Painter.cpp
View File

@ -85,7 +85,7 @@ void Painter::PaintReplayNotice(rct_drawpixelinfo* dpi, const char* text)
ScreenCoordsXY screenCoords(_uiContext->GetWidth() / 2, _uiContext->GetHeight() - 44);
char buffer[64]{};
FormatStringToBuffer(buffer, sizeof(buffer), "{MEDIUMFONT}{OUTLINE}{RED}{STRING}", text);
FormatStringToBuffer(buffer, sizeof(buffer), "{OUTLINE}{RED}{STRING}", text);
auto stringWidth = gfx_get_string_width(buffer, FontSpriteBase::MEDIUM);
screenCoords.x = screenCoords.x - stringWidth;
@ -104,7 +104,7 @@ void Painter::PaintFPS(rct_drawpixelinfo* dpi)
MeasureFPS();
char buffer[64]{};
FormatStringToBuffer(buffer, sizeof(buffer), "{MEDIUMFONT}{OUTLINE}{WHITE}{INT32}", _currentFPS);
FormatStringToBuffer(buffer, sizeof(buffer), "{OUTLINE}{WHITE}{INT32}", _currentFPS);
// Draw Text
int32_t stringWidth = gfx_get_string_width(buffer, FontSpriteBase::MEDIUM);

4
src/openrct2/title/TitleScreen.cpp
View File

@ -436,7 +436,7 @@ void DrawOpenRCT2(rct_drawpixelinfo* dpi, const ScreenCoordsXY& screenCoords)
{
thread_local std::string buffer;
buffer.clear();
buffer.assign("{MEDIUMFONT}{OUTLINE}{WHITE}");
buffer.assign("{OUTLINE}{WHITE}");
// Write name and version information
buffer += gVersionInfoFull;
@ -448,7 +448,7 @@ void DrawOpenRCT2(rct_drawpixelinfo* dpi, const ScreenCoordsXY& screenCoords)
{ screenCoords, screenCoords + ScreenCoordsXY{ width, 30 } }); // 30 is an arbitrary height to catch both strings
// Write platform information
buffer.assign("{MEDIUMFONT}{OUTLINE}{WHITE}");
buffer.assign("{OUTLINE}{WHITE}");
buffer.append(OPENRCT2_PLATFORM);
buffer.append(" (");
buffer.append(OPENRCT2_ARCHITECTURE);