From c615d08d7845e55a68c0b77286b6bd288c2b0453 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 1 Aug 2018 12:14:02 +0200 Subject: [PATCH] Remove many unused strings --- data/language/en-GB.txt | 843 +------------------------- src/openrct2-ui/windows/Map.cpp | 12 +- src/openrct2-ui/windows/Options.cpp | 4 +- src/openrct2/localisation/StringIds.h | 115 ++-- 4 files changed, 42 insertions(+), 932 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 715d8ab315..4c5a8fe466 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -94,425 +94,6 @@ STR_0089 :Mini Roller Coaster STR_0090 :Mine Ride STR_0091 :Unknown Ride (59) STR_0092 :LIM Launched Roller Coaster -STR_0093 : -STR_0094 : -STR_0095 : -STR_0096 : -STR_0097 : -STR_0098 : -STR_0099 : -STR_0100 : -STR_0101 : -STR_0102 : -STR_0103 : -STR_0104 : -STR_0105 : -STR_0106 : -STR_0107 : -STR_0108 : -STR_0109 : -STR_0110 : -STR_0111 : -STR_0112 : -STR_0113 : -STR_0114 : -STR_0115 : -STR_0116 : -STR_0117 : -STR_0118 : -STR_0119 : -STR_0120 : -STR_0121 : -STR_0122 : -STR_0123 : -STR_0124 : -STR_0125 : -STR_0126 : -STR_0127 : -STR_0128 : -STR_0129 : -STR_0130 : -STR_0131 : -STR_0132 : -STR_0133 : -STR_0134 : -STR_0135 : -STR_0136 : -STR_0137 : -STR_0138 : -STR_0139 : -STR_0140 : -STR_0141 : -STR_0142 : -STR_0143 : -STR_0144 : -STR_0145 : -STR_0146 : -STR_0147 : -STR_0148 : -STR_0149 : -STR_0150 : -STR_0151 : -STR_0152 : -STR_0153 : -STR_0154 : -STR_0155 : -STR_0156 : -STR_0157 : -STR_0158 : -STR_0159 : -STR_0160 : -STR_0161 : -STR_0162 : -STR_0163 : -STR_0164 : -STR_0165 : -STR_0166 : -STR_0167 : -STR_0168 : -STR_0169 : -STR_0170 : -STR_0171 : -STR_0172 : -STR_0173 : -STR_0174 : -STR_0175 : -STR_0176 : -STR_0177 : -STR_0178 : -STR_0179 : -STR_0180 : -STR_0181 : -STR_0182 : -STR_0183 : -STR_0184 : -STR_0185 : -STR_0186 : -STR_0187 : -STR_0188 : -STR_0189 : -STR_0190 : -STR_0191 : -STR_0192 : -STR_0193 : -STR_0194 : -STR_0195 : -STR_0196 : -STR_0197 : -STR_0198 : -STR_0199 : -STR_0200 : -STR_0201 : -STR_0202 : -STR_0203 : -STR_0204 : -STR_0205 : -STR_0206 : -STR_0207 : -STR_0208 : -STR_0209 : -STR_0210 : -STR_0211 : -STR_0212 : -STR_0213 : -STR_0214 : -STR_0215 : -STR_0216 : -STR_0217 : -STR_0218 : -STR_0219 : -STR_0220 : -STR_0221 : -STR_0222 : -STR_0223 : -STR_0224 : -STR_0225 : -STR_0226 : -STR_0227 : -STR_0228 : -STR_0229 : -STR_0230 : -STR_0231 : -STR_0232 : -STR_0233 : -STR_0234 : -STR_0235 : -STR_0236 : -STR_0237 : -STR_0238 : -STR_0239 : -STR_0240 : -STR_0241 : -STR_0242 : -STR_0243 : -STR_0244 : -STR_0245 : -STR_0246 : -STR_0247 : -STR_0248 : -STR_0249 : -STR_0250 : -STR_0251 : -STR_0252 : -STR_0253 : -STR_0254 : -STR_0255 : -STR_0256 : -STR_0257 : -STR_0258 : -STR_0259 : -STR_0260 : -STR_0261 : -STR_0262 : -STR_0263 : -STR_0264 : -STR_0265 : -STR_0266 : -STR_0267 : -STR_0268 : -STR_0269 : -STR_0270 : -STR_0271 : -STR_0272 : -STR_0273 : -STR_0274 : -STR_0275 : -STR_0276 : -STR_0277 : -STR_0278 : -STR_0279 : -STR_0280 : -STR_0281 : -STR_0282 : -STR_0283 : -STR_0284 : -STR_0285 : -STR_0286 : -STR_0287 : -STR_0288 : -STR_0289 : -STR_0290 : -STR_0291 : -STR_0292 : -STR_0293 : -STR_0294 : -STR_0295 : -STR_0296 : -STR_0297 : -STR_0298 : -STR_0299 : -STR_0300 : -STR_0301 : -STR_0302 : -STR_0303 : -STR_0304 : -STR_0305 : -STR_0306 : -STR_0307 : -STR_0308 : -STR_0309 : -STR_0310 : -STR_0311 : -STR_0312 : -STR_0313 : -STR_0314 : -STR_0315 : -STR_0316 : -STR_0317 : -STR_0318 : -STR_0319 : -STR_0320 : -STR_0321 : -STR_0322 : -STR_0323 : -STR_0324 : -STR_0325 : -STR_0326 : -STR_0327 : -STR_0328 : -STR_0329 : -STR_0330 : -STR_0331 : -STR_0332 : -STR_0333 : -STR_0334 : -STR_0335 : -STR_0336 : -STR_0337 : -STR_0338 : -STR_0339 : -STR_0340 : -STR_0341 : -STR_0342 : -STR_0343 : -STR_0344 : -STR_0345 : -STR_0346 : -STR_0347 : -STR_0348 : -STR_0349 : -STR_0350 : -STR_0351 : -STR_0352 : -STR_0353 : -STR_0354 : -STR_0355 : -STR_0356 : -STR_0357 : -STR_0358 : -STR_0359 : -STR_0360 : -STR_0361 : -STR_0362 : -STR_0363 : -STR_0364 : -STR_0365 : -STR_0366 : -STR_0367 : -STR_0368 : -STR_0369 : -STR_0370 : -STR_0371 : -STR_0372 : -STR_0373 : -STR_0374 : -STR_0375 : -STR_0376 : -STR_0377 : -STR_0378 : -STR_0379 : -STR_0380 : -STR_0381 : -STR_0382 : -STR_0383 : -STR_0384 : -STR_0385 : -STR_0386 : -STR_0387 : -STR_0388 : -STR_0389 : -STR_0390 : -STR_0391 : -STR_0392 : -STR_0393 : -STR_0394 : -STR_0395 : -STR_0396 : -STR_0397 : -STR_0398 : -STR_0399 : -STR_0400 : -STR_0401 : -STR_0402 : -STR_0403 : -STR_0404 : -STR_0405 : -STR_0406 : -STR_0407 : -STR_0408 : -STR_0409 : -STR_0410 : -STR_0411 : -STR_0412 : -STR_0413 : -STR_0414 : -STR_0415 : -STR_0416 : -STR_0417 : -STR_0418 : -STR_0419 : -STR_0420 : -STR_0421 : -STR_0422 : -STR_0423 : -STR_0424 : -STR_0425 : -STR_0426 : -STR_0427 : -STR_0428 : -STR_0429 : -STR_0430 : -STR_0431 : -STR_0432 : -STR_0433 : -STR_0434 : -STR_0435 : -STR_0436 : -STR_0437 : -STR_0438 : -STR_0439 : -STR_0440 : -STR_0441 : -STR_0442 : -STR_0443 : -STR_0444 : -STR_0445 : -STR_0446 : -STR_0447 : -STR_0448 : -STR_0449 : -STR_0450 : -STR_0451 : -STR_0452 : -STR_0453 : -STR_0454 : -STR_0455 : -STR_0456 : -STR_0457 : -STR_0458 : -STR_0459 : -STR_0460 : -STR_0461 : -STR_0462 : -STR_0463 : -STR_0464 : -STR_0465 : -STR_0466 : -STR_0467 : -STR_0468 : -STR_0469 : -STR_0470 : -STR_0471 : -STR_0472 : -STR_0473 : -STR_0474 : -STR_0475 : -STR_0476 : -STR_0477 : -STR_0478 : -STR_0479 : -STR_0480 : -STR_0481 : -STR_0482 : -STR_0483 : -STR_0484 : -STR_0485 : -STR_0486 : -STR_0487 : -STR_0488 : -STR_0489 : -STR_0490 : -STR_0491 : -STR_0492 : -STR_0493 : -STR_0494 : -STR_0495 : -STR_0496 : -STR_0497 : -STR_0498 : -STR_0499 : -STR_0500 : -STR_0501 : -STR_0502 : -STR_0503 : -STR_0504 : -STR_0505 : -STR_0506 : -STR_0507 : -STR_0508 : -STR_0509 : -STR_0510 : -STR_0511 : STR_0512 :A compact roller coaster with a spiral lift hill and smooth, twisting drops. STR_0513 :A looping roller coaster where the riders ride in a standing position STR_0514 :Trains suspended beneath the roller coaster track swing out to the side around corners @@ -542,12 +123,9 @@ STR_0537 :Self-drive electric dodgem cars STR_0538 :Large swinging pirate ship STR_0539 :Ship is attached to an arm with a counterweight at the opposite end, and swings through a complete 360 degrees STR_0540 :A stall where guests can purchase food -STR_0541 : STR_0542 :A stall where guests can purchase drinks -STR_0543 : STR_0544 :A stall that sells souvenirs STR_0545 :Traditional rotating carousel with carved wooden horses -STR_0546 : STR_0547 :A stall where guests can obtain park maps and purchase umbrellas STR_0548 :A toilet building STR_0549 :Rotating big wheel with open chairs @@ -569,15 +147,12 @@ STR_0564 :Running on wooden track, this coaster is fast, rough, noisy, and gi STR_0565 :A simple wooden roller coaster capable of only gentle slopes and turns, where the cars are only kept on the track by side friction wheels and gravity STR_0566 :Individual roller coaster cars zip around a tight zig-zag layout of track with sharp corners and short sharp drops STR_0567 :Sitting in seats suspended either side of the track, riders are pitched head-over-heels while they plunge down steep drops and travel through various inversions -STR_0568 : STR_0569 :Riding in special harnesses below the track, riders experience the feeling of flight as they swoop through the air -STR_0570 : STR_0571 :Circular cars spin around as they travel along the zig-zagging wooden track STR_0572 :Large capacity boats travel along a wide water channel, propelled up slopes by a conveyor belt, accelerating down steep slopes to soak the riders with a giant splash STR_0573 :Powered helicopter shaped cars running on a steel track, controlled by the pedalling of the riders STR_0574 :Riders are held in special harnesses in a lying-down position, travelling through twisted track and inversions either on their backs or facing the ground STR_0575 :Powered trains hanging from a single rail transport people around the park -STR_0576 : STR_0577 :Bogied cars run on wooden tracks, turning around on special reversing sections STR_0578 :Cars run along track enclosed by circular hoops, traversing steep drops and heartline twists STR_0579 :A gentle game of miniature golf @@ -593,191 +168,16 @@ STR_0588 :Individual cars run beneath a zig-zagging track with hairpin turns STR_0589 :A large flying-carpet themed car which moves up and down cyclically on the ends of 4 arms STR_0590 :Riders ride in a submerged submarine through an underwater course STR_0591 :Raft-shaped boats gently meander around a river track -STR_0592 : STR_0593 :Rotating wheel with suspended passenger pods, which first starts spinning and is then tilted up by a supporting arm -STR_0594 : -STR_0595 : -STR_0596 : -STR_0597 : STR_0598 :Inverted roller coaster trains are accelerated out of the station to travel up a vertical spike of track, then reverse back through the station to travel backwards up another vertical spike of track STR_0599 :A compact roller coaster with individual cars and smooth twisting drops STR_0600 :Powered mine trains career along a smooth and twisted track layout -STR_0601 : STR_0602 :Roller coaster trains are accelerated out of the station by linear induction motors to speed through twisting inversions -STR_0603 : -STR_0604 : -STR_0605 : -STR_0606 : -STR_0607 : -STR_0608 : -STR_0609 : -STR_0610 : -STR_0611 : -STR_0612 : -STR_0613 : -STR_0614 : -STR_0615 : -STR_0616 : -STR_0617 : -STR_0618 : -STR_0619 : -STR_0620 : -STR_0621 : -STR_0622 : -STR_0623 : -STR_0624 : -STR_0625 : -STR_0626 : -STR_0627 : -STR_0628 : -STR_0629 : -STR_0630 : -STR_0631 : -STR_0632 : -STR_0633 : -STR_0634 : -STR_0635 : -STR_0636 : -STR_0637 : -STR_0638 : -STR_0639 : -STR_0640 : -STR_0641 : -STR_0642 : -STR_0643 : -STR_0644 : -STR_0645 : -STR_0646 : -STR_0647 : -STR_0648 : -STR_0649 : -STR_0650 : -STR_0651 : -STR_0652 : -STR_0653 : -STR_0654 : -STR_0655 : -STR_0656 : -STR_0657 : -STR_0658 : -STR_0659 : -STR_0660 : -STR_0661 : -STR_0662 : -STR_0663 : -STR_0664 : -STR_0665 : -STR_0666 : -STR_0667 : -STR_0668 : -STR_0669 : -STR_0670 : -STR_0671 : -STR_0672 : -STR_0673 : -STR_0674 : -STR_0675 : -STR_0676 : -STR_0677 : -STR_0678 : -STR_0679 : -STR_0680 : -STR_0681 : -STR_0682 : -STR_0683 : -STR_0684 : -STR_0685 : -STR_0686 : -STR_0687 : -STR_0688 : -STR_0689 : -STR_0690 : -STR_0691 : -STR_0692 : -STR_0693 : -STR_0694 : -STR_0695 : -STR_0696 : -STR_0697 : -STR_0698 : -STR_0699 : -STR_0700 : -STR_0701 : -STR_0702 : -STR_0703 : -STR_0704 : -STR_0705 : -STR_0706 : -STR_0707 : -STR_0708 : -STR_0709 : -STR_0710 : -STR_0711 : -STR_0712 : -STR_0713 : -STR_0714 : -STR_0715 : -STR_0716 : -STR_0717 : -STR_0718 : -STR_0719 : -STR_0720 : -STR_0721 : -STR_0722 : -STR_0723 : -STR_0724 : -STR_0725 : -STR_0726 : -STR_0727 : -STR_0728 : -STR_0729 : -STR_0730 : -STR_0731 : -STR_0732 : -STR_0733 : -STR_0734 : -STR_0735 : -STR_0736 : -STR_0737 : -STR_0738 : -STR_0739 : -STR_0740 : -STR_0741 : -STR_0742 : -STR_0743 : -STR_0744 : -STR_0745 : -STR_0746 : -STR_0747 : -STR_0748 : -STR_0749 : -STR_0750 : -STR_0751 : -STR_0752 : -STR_0753 : -STR_0754 : -STR_0755 : -STR_0756 : -STR_0757 : -STR_0758 : -STR_0759 : -STR_0760 : -STR_0761 : -STR_0762 : -STR_0763 : -STR_0764 : -STR_0765 : -STR_0766 : STR_0767 :Guest {INT32} STR_0768 :Handyman {INT32} STR_0769 :Mechanic {INT32} STR_0770 :Security Guard {INT32} STR_0771 :Entertainer {INT32} -STR_0772 :Unnamed park{POP16}{POP16} -STR_0773 :Unnamed park{POP16}{POP16} -STR_0774 :Unnamed park{POP16}{POP16} -STR_0775 :Unnamed park{POP16}{POP16} -STR_0776 :Unnamed park{POP16}{POP16} STR_0777 :Unnamed park{POP16}{POP16} STR_0778 :Sign STR_0779 :1st @@ -836,22 +236,9 @@ STR_0831 :{SMALLFONT}{BLACK}Zoom view out STR_0832 :{SMALLFONT}{BLACK}Rotate view 90{DEGREE} clockwise STR_0833 :{SMALLFONT}{BLACK}Pause game STR_0834 :{SMALLFONT}{BLACK}Disk and game options -STR_0835 :Game initialisation failed -STR_0836 :Unable to start game in a minimised state -STR_0837 :Unable to initialise graphics system -STR_0838 : STR_0839 :{UINT16} x {UINT16} STR_0840 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{UINT16} x {UINT16} -# The following six strings were used for display resolutions, but have been replaced. -STR_0841 : -STR_0842 : -STR_0843 : -STR_0844 : -STR_0845 : -STR_0846 : STR_0847 :About 'OpenRCT2' -STR_0848 :RollerCoaster Tycoon 2 -STR_0849 : STR_0850 :{WINDOW_COLOUR_2}Copyright {COPYRIGHT} 2002 Chris Sawyer, all rights reserved STR_0851 :{WINDOW_COLOUR_2}Designed and programmed by Chris Sawyer STR_0852 :{WINDOW_COLOUR_2}Graphics by Simon Foster @@ -860,13 +247,6 @@ STR_0854 :{WINDOW_COLOUR_2}Additional sounds recorded by David Ellis STR_0855 :{WINDOW_COLOUR_2}Representation by Jacqui Lyons at Marjacq Ltd. STR_0856 :{WINDOW_COLOUR_2}Thanks to: STR_0857 :{WINDOW_COLOUR_2}Peter James Adcock, Joe Booth, and John Wardley -STR_0858 : -STR_0859 : -STR_0860 : -STR_0861 : -STR_0862 : -STR_0863 : -STR_0864 : STR_0865 :{STRINGID} STR_0866 :{POP16}{STRINGID} STR_0867 :{POP16}{POP16}{STRINGID} @@ -888,11 +268,9 @@ STR_0882 :Load Game STR_0883 :Save Game STR_0884 :Load Landscape STR_0885 :Save Landscape -STR_0886 : STR_0887 :Quit Scenario Editor STR_0888 :Quit Track Designer STR_0889 :Quit Track Designs Manager -STR_0890 : STR_0891 :Screenshot STR_0892 :Screenshot saved to disk as '{STRINGID}' STR_0893 :Screenshot failed ! @@ -1653,8 +1031,6 @@ STR_1647 : STR_1648 :{SMALLFONT}{OPENQUOTES}Help! Put me down!{ENDQUOTES} STR_1649 :{SMALLFONT}{OPENQUOTES}I'm running out of cash!{ENDQUOTES} STR_1650 :{SMALLFONT}{OPENQUOTES}Wow! A new ride being built!{ENDQUOTES} -STR_1651 : -STR_1652 : STR_1653 :{SMALLFONT}{OPENQUOTES}...and here we are on {STRINGID}!{ENDQUOTES} STR_1654 :{WINDOW_COLOUR_2}Recent thoughts: STR_1655 :{SMALLFONT}{BLACK}Construct footpath on land @@ -1739,7 +1115,6 @@ STR_1733 :Mode STR_1734 :{WINDOW_COLOUR_2}Number of laps: STR_1735 :{SMALLFONT}{BLACK}Number of laps of circuit STR_1736 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16} -STR_1737 :{COMMA16} STR_1738 :Can't change number of laps... STR_1739 :Race won by guest {INT32} STR_1740 :Race won by {STRINGID} @@ -1747,12 +1122,10 @@ STR_1741 :Not yet constructed ! STR_1742 :{WINDOW_COLOUR_2}Max. people on ride: STR_1743 :{SMALLFONT}{BLACK}Maximum number of people allowed on this ride at one time STR_1744 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16} -STR_1745 :{COMMA16} STR_1746 :Can't change this... STR_1747 :{WINDOW_COLOUR_2}Time limit: STR_1748 :{SMALLFONT}{BLACK}Time limit for ride STR_1749 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{DURATION} -STR_1750 :{DURATION} STR_1751 :Can't change time limit for ride... STR_1752 :{SMALLFONT}{BLACK}Show list of individual guests in park STR_1753 :{SMALLFONT}{BLACK}Show summarised list of guests in park @@ -1774,11 +1147,8 @@ STR_1768 :Can't change number of swings... STR_1769 :{WINDOW_COLOUR_2}Number of swings: STR_1770 :{SMALLFONT}{BLACK}Number of complete swings STR_1771 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16} -STR_1772 :{COMMA16} STR_1773 :Only one on-ride photo section allowed per ride STR_1774 :Only one cable lift hill allowed per ride -STR_1775 : -STR_1776 : STR_1777 :{WINDOW_COLOUR_2}Ride music STR_1778 :{STRINGID} - - STR_1779 :{INLINE_SPRITE}{254}{19}{00}{00} Panda costume @@ -1799,7 +1169,6 @@ STR_1793 :Heading to {STRINGID} for an inspection STR_1794 :Fixing {STRINGID} STR_1795 :Answering radio call STR_1796 :Has broken down and requires fixing -STR_1797 :This option cannot be changed for this ride STR_1798 :Whirlpool STR_1799 :{POP16}{POP16}{POP16}{POP16}{POP16}{CURRENCY2DP} STR_1800 :Safety cut-out @@ -1874,7 +1243,6 @@ STR_1868 :Can't change number of rotations... STR_1869 :{WINDOW_COLOUR_2}Number of rotations: STR_1870 :{SMALLFONT}{BLACK}Number of complete rotations STR_1871 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16} -STR_1872 :{COMMA16} STR_1873 :{WINDOW_COLOUR_2}Income: {BLACK}{CURRENCY2DP} per hour STR_1874 :{WINDOW_COLOUR_2}Profit: {BLACK}{CURRENCY2DP} per hour STR_1875 :{BLACK} {SPRITE}{BLACK} {STRINGID} @@ -1894,10 +1262,6 @@ STR_1888 :{WINDOW_COLOUR_2}Time since last inspection: {BLACK}more than 4 hou STR_1889 :{WINDOW_COLOUR_2}Down-Time: {MOVE_X}{255}{BLACK}{COMMA16}% STR_1890 :{SMALLFONT}{BLACK}Select how often a mechanic should check this ride STR_1891 :No {STRINGID} in park yet! -# The following two strings were used to display an error when the disc was missing. -# This has been replaced in OpenRCT2. -STR_1892 : -STR_1893 : STR_1894 :{WINDOW_COLOUR_2}{STRINGID} sold: {BLACK}{COMMA32} STR_1895 :{SMALLFONT}{BLACK}Build new ride/attraction STR_1896 :{WINDOW_COLOUR_2}Expenditure/Income @@ -1927,7 +1291,6 @@ STR_1919 :Not enough cash available! STR_1920 :Can't pay back loan! STR_1921 :{SMALLFONT}{BLACK}Start a new game STR_1922 :{SMALLFONT}{BLACK}Continue playing a saved game -STR_1923 : STR_1924 :{SMALLFONT}{BLACK}Exit STR_1925 :Can't place person here... STR_1926 :{SMALLFONT} @@ -2104,9 +1467,6 @@ STR_2096 :Fried Chicken STR_2097 :Lemonade STR_2098 :Empty Box STR_2099 :Empty Bottle -STR_2100 :{WINDOW_COLOUR_2}On-Ride Photo price: -STR_2101 :{WINDOW_COLOUR_2}On-Ride Photo price: -STR_2102 :{WINDOW_COLOUR_2}On-Ride Photo price: STR_2103 :{WINDOW_COLOUR_2}Pretzel price: STR_2104 :{WINDOW_COLOUR_2}Hot Chocolate price: STR_2105 :{WINDOW_COLOUR_2}Iced Tea price: @@ -2126,9 +1486,6 @@ STR_2118 :{WINDOW_COLOUR_2} STR_2119 :{WINDOW_COLOUR_2} STR_2120 :{WINDOW_COLOUR_2}Roast Sausage price: STR_2121 :{WINDOW_COLOUR_2} -STR_2122 :On-Ride Photo -STR_2123 :On-Ride Photo -STR_2124 :On-Ride Photo STR_2125 :Pretzel STR_2126 :Hot Chocolate STR_2127 :Iced Tea @@ -2148,9 +1505,6 @@ STR_2140 :Empty Drink Carton STR_2141 :Empty Juice Cup STR_2142 :Roast Sausage STR_2143 :Empty Bowl -STR_2144 :On-Ride Photos -STR_2145 :On-Ride Photos -STR_2146 :On-Ride Photos STR_2147 :Pretzels STR_2148 :Hot Chocolates STR_2149 :Iced Teas @@ -2170,9 +1524,6 @@ STR_2162 :Empty Drink Cartons STR_2163 :Empty Juice cups STR_2164 :Roast Sausages STR_2165 :Empty Bowls -STR_2166 :an On-Ride Photo -STR_2167 :an On-Ride Photo -STR_2168 :an On-Ride Photo STR_2169 :a Pretzel STR_2170 :a Hot Chocolate STR_2171 :an Iced Tea @@ -2192,9 +1543,6 @@ STR_2184 :an Empty Drink Carton STR_2185 :an Empty Juice Cup STR_2186 :a Roast Sausage STR_2187 :an Empty Bowl -STR_2188 :On-Ride Photo of {STRINGID} -STR_2189 :On-Ride Photo of {STRINGID} -STR_2190 :On-Ride Photo of {STRINGID} STR_2191 :Pretzel STR_2192 :Hot Chocolate STR_2193 :Iced Tea @@ -2294,7 +1642,6 @@ STR_2286 :Designing STR_2287 :Completing design STR_2288 :Unknown STR_2289 :{STRINGID} {STRINGID} -STR_2290 : STR_2291 :Select scenario for new game STR_2292 :{WINDOW_COLOUR_2}Rides been on: STR_2293 :{BLACK} Nothing @@ -2321,10 +1668,6 @@ STR_2313 :{WINDOW_COLOUR_2}Nausea rating: {BLACK}{COMMA2DP32} (approx.) STR_2314 :{WINDOW_COLOUR_2}Ride length: {BLACK}{STRINGID} STR_2315 :{WINDOW_COLOUR_2}Cost: {BLACK}around {CURRENCY} STR_2316 :{WINDOW_COLOUR_2}Space required: {BLACK}{COMMA16} x {COMMA16} blocks -STR_2317 : -STR_2318 : -STR_2319 : -STR_2320 : STR_2321 :{WINDOW_COLOUR_2}Number of rides/attractions: {BLACK}{COMMA16} STR_2322 :{WINDOW_COLOUR_2}Staff: {BLACK}{COMMA16} STR_2323 :{WINDOW_COLOUR_2}Park size: {BLACK}{COMMA32}m{SQUARED} @@ -2350,7 +1693,6 @@ STR_2342 :Krona (kr) STR_2343 :Euros ({EURO}) STR_2344 :Imperial STR_2345 :Metric -STR_2346 :Display STR_2347 :{RED}{STRINGID} has drowned! STR_2348 :{SMALLFONT}{BLACK}Show statistics for this staff member STR_2349 :{WINDOW_COLOUR_2}Wages: {BLACK}{CURRENCY} per month @@ -2361,7 +1703,6 @@ STR_2353 :{WINDOW_COLOUR_2}Litter swept: {BLACK}{COMMA16} STR_2354 :{WINDOW_COLOUR_2}Bins emptied: {BLACK}{COMMA16} STR_2355 :{WINDOW_COLOUR_2}Rides fixed: {BLACK}{COMMA16} STR_2356 :{WINDOW_COLOUR_2}Rides inspected: {BLACK}{COMMA16} -STR_2357 :House STR_2358 :Units STR_2359 :Real Values STR_2360 :Display Resolution: @@ -2426,8 +1767,6 @@ STR_2418 :Free entry to {STRINGID} STR_2419 :Free ride on {STRINGID} STR_2420 :Half-price entry to {STRINGID} STR_2421 :Free {STRINGID} -STR_2422 :Advertising campaign for {STRINGID} -STR_2423 :Advertising campaign for {STRINGID} STR_2424 :{WINDOW_COLOUR_2}Vouchers for free entry to the park STR_2425 :{WINDOW_COLOUR_2}Vouchers for free rides on a particular ride STR_2426 :{WINDOW_COLOUR_2}Vouchers for half-price entry to the park @@ -2441,12 +1780,6 @@ STR_2433 :{BLACK}Vouchers for free {STRINGID} STR_2434 :{BLACK}Advertising campaign for {STRINGID} STR_2435 :{BLACK}Advertising campaign for {STRINGID} STR_2436 :1 week -STR_2437 : -STR_2438 : -STR_2439 : -STR_2440 : -STR_2441 : -STR_2442 : STR_2443 :{WINDOW_COLOUR_2}Cost per week: {BLACK}{CURRENCY2DP} STR_2444 :{WINDOW_COLOUR_2}Total cost: {BLACK}{CURRENCY2DP} STR_2445 :Start this marketing campaign @@ -2459,8 +1792,6 @@ 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_2455 :{SMALLFONT}{BLACK}+{CURRENCY2DP} - -STR_2456 :{SMALLFONT}{BLACK}{CURRENCY2DP} - STR_2457 :{SMALLFONT}{BLACK}Show financial accounts STR_2458 :{SMALLFONT}{BLACK}Show graph of cash (less loan) over time STR_2459 :{SMALLFONT}{BLACK}Show graph of park value over time @@ -2489,8 +1820,6 @@ STR_2481 :{SMALLFONT}{BLACK}Show graph of lateral acceleration against time STR_2482 :{SMALLFONT}{BLACK}Profit: {CURRENCY} per week, Park Value: {CURRENCY} STR_2483 :{WINDOW_COLOUR_2}Weekly profit: {BLACK}+{CURRENCY2DP} STR_2484 :{WINDOW_COLOUR_2}Weekly profit: {RED}{CURRENCY2DP} -STR_2485 :Controls -STR_2486 :General STR_2487 :Show 'real' names of guests STR_2488 :{SMALLFONT}{BLACK}Toggle between showing 'real' names of guests and guest numbers STR_2489 :Shortcut keys... @@ -2687,8 +2016,6 @@ STR_2678 :??? STR_2679 :??? STR_2680 :All research complete STR_2681 :{MEDIUMFONT}{BLACK}Increases your money by {CURRENCY} -STR_2682 : -STR_2683 : STR_2684 :{SMALLFONT}{BLACK}Large group of guests arrive STR_2685 :Simplex Noise Parameters STR_2686 :Low: @@ -2753,7 +2080,6 @@ STR_2744 :[ STR_2745 :\ STR_2746 :] STR_2747 :{ENDQUOTES} -STR_2748 :Bar STR_2749 :My new scenario # New strings used in the cheats window previously these were ??? STR_2750 :Move all items to top @@ -2763,22 +2089,13 @@ STR_2753 :Mowed grass STR_2754 :Water plants STR_2755 :Fix vandalism STR_2756 :Remove litter -STR_2757 : -STR_2758 : -STR_2759 :Zero Clearance -STR_2760 :+{CURRENCY} -STR_2761 : -STR_2762 : STR_2763 :??? -STR_2764 : STR_2765 :Large Tram STR_2766 :Win scenario STR_2767 :Freeze Climate STR_2768 :Unfreeze Climate STR_2769 :Open Park STR_2770 :Close Park -STR_2771 :Slower Gamespeed -STR_2772 :Faster Gamespeed STR_2773 :Windowed STR_2774 :Fullscreen STR_2775 :Fullscreen (borderless window) @@ -2863,11 +2180,7 @@ STR_2852 :Track design already installed STR_2853 :Forbidden by the local authority! STR_2854 :{RED}Guests can't get to the entrance of {STRINGID} !{NEWLINE}Construct a path to the entrance STR_2855 :{RED}{STRINGID} has no path leading from its exit !{NEWLINE}Construct a path from the ride exit -STR_2856 : -STR_2857 : STR_2858 :Can't start marketing campaign... -STR_2859 :Another instance of OpenRCT2 is already running -STR_2860 : STR_2861 :{WINDOW_COLOUR_2}Licensed to Infogrames Interactive Inc. STR_2862 :Music acknowledgements... STR_2863 :Music acknowledgements @@ -2907,7 +2220,6 @@ STR_2896 :{WINDOW_COLOUR_2}Hypothermia: (Allister Brimble) copyright {COPYR STR_2897 :{WINDOW_COLOUR_2}Last Sleigh Ride: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer STR_2898 :{WINDOW_COLOUR_2}Pipes of Glencairn: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer STR_2899 :{WINDOW_COLOUR_2}Traffic Jam: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer -STR_2900 : STR_2901 :{WINDOW_COLOUR_2}(Samples courtesy of Spectrasonics {ENDQUOTES}Liquid Grooves{ENDQUOTES}) STR_2902 :{WINDOW_COLOUR_2}Toccata: (C.M.Widor, played by Peter James Adcock) recording {COPYRIGHT} Chris Sawyer STR_2903 :{WINDOW_COLOUR_2}Space Rock: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer @@ -2915,69 +2227,6 @@ STR_2904 :{WINDOW_COLOUR_2}Manic Mechanic: (Allister Brimble) copyright {CO STR_2905 :{WINDOW_COLOUR_2}Techno Torture: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer STR_2906 :{WINDOW_COLOUR_2}Sweat Dreams: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer STR_2907 :{WINDOW_COLOUR_2}What shall we do with the Drunken Sailor: (Anon/Allister Brimble) copyright {COPYRIGHT} Chris Sawyer -STR_2908 : -STR_2909 : -STR_2910 : -STR_2911 : -STR_2912 : -STR_2913 : -STR_2914 : -STR_2915 : -STR_2916 : -STR_2917 : -STR_2918 : -STR_2919 : -STR_2920 : -STR_2921 : -STR_2922 : -STR_2923 : -STR_2924 : -STR_2925 : -STR_2926 : -STR_2927 : -STR_2928 : -STR_2929 : -STR_2930 : -STR_2931 :{WINDOW_COLOUR_2} -STR_2932 :{WINDOW_COLOUR_2} -STR_2933 :{WINDOW_COLOUR_2} -STR_2934 :{WINDOW_COLOUR_2} -STR_2935 :{WINDOW_COLOUR_2} -STR_2936 :{WINDOW_COLOUR_2} -STR_2937 :{WINDOW_COLOUR_2} -STR_2938 :{WINDOW_COLOUR_2} -STR_2939 :{WINDOW_COLOUR_2} -STR_2940 :{WINDOW_COLOUR_2} -STR_2941 :{WINDOW_COLOUR_2} -STR_2942 :{WINDOW_COLOUR_2} -STR_2943 :{WINDOW_COLOUR_2} -STR_2944 :{WINDOW_COLOUR_2} -STR_2945 :{WINDOW_COLOUR_2} -STR_2946 :{WINDOW_COLOUR_2} -STR_2947 :{WINDOW_COLOUR_2} -STR_2948 :{WINDOW_COLOUR_2} -STR_2949 :{WINDOW_COLOUR_2} -STR_2950 :{WINDOW_COLOUR_2} -STR_2951 :{WINDOW_COLOUR_2} -STR_2952 :{WINDOW_COLOUR_2} -STR_2953 :{WINDOW_COLOUR_2} -STR_2954 :{WINDOW_COLOUR_2} -STR_2955 :{WINDOW_COLOUR_2} -STR_2956 :{WINDOW_COLOUR_2} -STR_2957 :{WINDOW_COLOUR_2} -STR_2958 :{WINDOW_COLOUR_2} -STR_2959 :{WINDOW_COLOUR_2} -STR_2960 :{WINDOW_COLOUR_2} -STR_2961 :{WINDOW_COLOUR_2} -STR_2962 :{WINDOW_COLOUR_2} -STR_2963 :{WINDOW_COLOUR_2} -STR_2964 :{WINDOW_COLOUR_2} -STR_2965 :{WINDOW_COLOUR_2} -STR_2966 : -STR_2967 : -STR_2968 : -STR_2969 : -STR_2970 : STR_2971 :Main colour scheme STR_2972 :Alternative colour scheme 1 STR_2973 :Alternative colour scheme 2 @@ -3053,7 +2302,6 @@ STR_3042 :Pirates style STR_3043 :Rock style 3 STR_3044 :Candy style STR_3045 :{SMALLFONT}{BLACK}Select style of music to play -STR_3046 :This ride cannot be modified STR_3047 :Local authority forbids demolition or modifications to this ride STR_3048 :Marketing campaigns forbidden by local authority STR_3049 :Golf hole A @@ -3062,9 +2310,6 @@ STR_3051 :Golf hole C STR_3052 :Golf hole D STR_3053 :Golf hole E STR_3054 :Loading... -STR_3055 : -STR_3056 : -STR_3057 : STR_3058 :Brick walls STR_3059 :Hedges STR_3060 :Ice blocks @@ -3105,7 +2350,6 @@ STR_3094 :N/A STR_3095 :{WINDOW_COLOUR_2}Lift hill chain speed: STR_3096 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{VELOCITY} STR_3097 :{SMALLFONT}{BLACK}Select lift hill chain speed -STR_3098 :Can't change lift hill speed... STR_3099 :{SMALLFONT}{BLACK}Select colour STR_3100 :{SMALLFONT}{BLACK}Select second colour STR_3101 :{SMALLFONT}{BLACK}Select third colour @@ -3152,31 +2396,14 @@ STR_3141 :Multi-circuit per ride not possible with cable lift hill STR_3142 :{WINDOW_COLOUR_2}Capacity: {BLACK}{STRINGID} STR_3143 :{SMALLFONT}{BLACK}Show people on map STR_3144 :{SMALLFONT}{BLACK}Show rides and stalls on map -STR_3145 :{SMALLFONT}{BLACK}Scroll {STRINGID} left -STR_3146 :{SMALLFONT}{BLACK}Scroll {STRINGID} right -STR_3147 :{SMALLFONT}{BLACK}Scroll {STRINGID} left fast -STR_3148 :{SMALLFONT}{BLACK}Scroll {STRINGID} right fast -STR_3149 :{SMALLFONT}{BLACK}Scroll {STRINGID} left/right -STR_3150 :{SMALLFONT}{BLACK}Scroll {STRINGID} up -STR_3151 :{SMALLFONT}{BLACK}Scroll {STRINGID} down -STR_3152 :{SMALLFONT}{BLACK}Scroll {STRINGID} up fast -STR_3153 :{SMALLFONT}{BLACK}Scroll {STRINGID} down fast -STR_3154 :{SMALLFONT}{BLACK}Scroll {STRINGID} up/down -STR_3155 : -STR_3156 : -STR_3157 :map STR_3158 :graph STR_3159 :list STR_3160 :{SMALLFONT}{BLACK}Select the number of circuits per ride -STR_3161 : STR_3162 :Unable to allocate enough memory STR_3163 :Installing new data: STR_3164 :{BLACK}{COMMA16} selected (maximum {COMMA16}) -STR_3165 : -STR_3166 :{BLACK}(ID: STR_3167 :{WINDOW_COLOUR_2}Includes: {BLACK}{COMMA16} objects -STR_3168 :{WINDOW_COLOUR_2}Text: {BLACK}{STRINGID} -STR_3169 :Data for the following object not found: +STR_3169 :Data for the following object not found: STR_3170 :Not enough space for graphics STR_3171 :Too many objects of this type selected STR_3172 :The following object must be selected first: {STRING} @@ -3330,9 +2557,6 @@ STR_3319 :{WINDOW_COLOUR_2}Scenario Group: STR_3320 :Unable to save scenario file... STR_3321 :New objects installed successfully STR_3322 :{WINDOW_COLOUR_2}Objective: {BLACK}{STRINGID} -STR_3323 :Missing object data, ID: -STR_3324 :Requires Add-On Pack: {STRINGID} -STR_3325 :Requires an Add-On Pack STR_3326 :{WINDOW_COLOUR_2}(no image) STR_3327 :Starting positions for people not set STR_3328 :Can't advance to next editor stage... @@ -3344,7 +2568,6 @@ STR_3333 :Export plug-in objects with saved games STR_3334 :{SMALLFONT}{BLACK}Select whether to save any additional plug-in object data required (add-in data not supplied with the main product) in saved game or scenario files, allowing them to be loaded by someone who doesn't have the additional object data STR_3335 :Track Designer - Select Ride Types & Vehicles STR_3336 :Track Designs Manager - Select Ride Type -STR_3337 : STR_3338 :{BLACK}Custom-designed layout STR_3339 :{BLACK}{COMMA16} design available, or custom-designed layout STR_3340 :{BLACK}{COMMA16} designs available, or custom-designed layout @@ -3369,8 +2592,6 @@ STR_3358 :Can't delete track design... STR_3359 :{BLACK}No track designs of this type STR_3360 :Warning! STR_3361 :Too many track designs of this type - Some will not be listed. -STR_3362 : -STR_3363 : STR_3364 :Advanced STR_3365 :{SMALLFONT}{BLACK}Allow selection of individual items of scenery in addition to scenery groups STR_3366 :{BLACK}= Ride @@ -3392,58 +2613,8 @@ STR_3381 :File is not compatible or contains invalid data STR_3382 :File copy failed STR_3383 :Select new name for track design STR_3384 :An existing track design already has this name - Please select a new name for this design: -STR_3385 : -STR_3386 : -STR_3387 : -STR_3388 :Unable to switch to selected mode STR_3389 :Unable to select additional item of scenery... STR_3390 :Too many items selected -STR_3391 : -STR_3392 : -STR_3393 : -STR_3394 : -STR_3395 : -STR_3396 : -STR_3397 : -STR_3398 : -STR_3399 : -STR_3400 : -STR_3401 : -STR_3402 : -STR_3403 : -STR_3404 : -STR_3405 : -STR_3406 : -STR_3407 : -STR_3408 : -STR_3409 : -STR_3410 : -STR_3411 : -STR_3412 : -STR_3413 : -STR_3414 : -STR_3415 : -STR_3416 : -STR_3417 : -STR_3418 : -STR_3419 : -STR_3420 : -STR_3421 : -STR_3422 : -STR_3423 : -STR_3424 : -STR_3425 : -STR_3426 : -STR_3427 : -STR_3428 : -STR_3429 : -STR_3430 : -STR_3431 : -STR_3432 : -STR_3433 : -STR_3434 : -STR_3435 : -STR_3436 : STR_3437 :{SMALLFONT}{BLACK}Clear large areas of scenery from landscape STR_3438 :Unable to remove all scenery from here... STR_3439 :Clear Scenery @@ -3460,7 +2631,6 @@ STR_5120 :Finances STR_5121 :Research STR_5122 :Select rides by track type (like in RCT1) STR_5123 :Renew rides -STR_5124 : STR_5125 :All destructible STR_5126 :Random title music STR_5127 :{SMALLFONT}{BLACK}While dragging, paint landscape instead of changing elevation @@ -3493,7 +2663,6 @@ STR_5153 :Edit Themes... STR_5154 :Hardware display STR_5155 :Allow testing of unfinished tracks STR_5156 :{SMALLFONT}{BLACK}Allows testing of most ride types even when the track is unfinished, does not apply to block sectioned modes -STR_5157 : STR_5158 :Quit to menu STR_5159 :Exit OpenRCT2 STR_5160 :{POP16}{MONTH} {PUSH16}{PUSH16}{STRINGID}, Year {POP16}{COMMA16} @@ -3677,8 +2846,6 @@ STR_5337 :Park entrance STR_5338 :Element type STR_5339 :{SMALLFONT}{BLACK}Base height STR_5340 :{SMALLFONT}{BLACK}Clearance height -STR_5341 : -STR_5342 : STR_5343 :Automatically place staff STR_5344 :Changelog STR_5345 :Financial cheats @@ -3830,7 +2997,6 @@ STR_5490 :Disable audio on focus loss STR_5491 :Inventions list STR_5492 :Scenario options STR_5493 :Send Message -STR_5494 : STR_5495 :Player List STR_5496 :Player STR_5497 :Ping @@ -3843,7 +3009,6 @@ STR_5503 :Enter hostname or IP address: STR_5504 :{SMALLFONT}{BLACK}Show multiplayer status STR_5505 :Unable to connect to server. STR_5506 :Guests ignore intensities -STR_5507 : STR_5508 :Allow loading files with incorrect checksums STR_5509 :{SMALLFONT}{BLACK}Allows loading scenarios and saves{NEWLINE}that have an incorrect checksum,{NEWLINE}like the scenarios from the demo{NEWLINE}or damaged saves. STR_5510 :Default sound device @@ -4033,10 +3198,7 @@ STR_5726 :{SMALLFONT}{BLACK}Sets the current weather in park STR_5727 :Scaling quality: STR_5728 :Requires hardware display option STR_5729 :{SMALLFONT}{BLACK}Requires hardware display option -STR_5730 : STR_5731 :Linear -STR_5732 : -STR_5733 : # tooltip for tab in options window STR_5734 :{SMALLFONT}{BLACK}Rendering STR_5735 :Network Status @@ -4124,10 +3286,8 @@ STR_5814 :{WINDOW_COLOUR_1}{OPENQUOTES}{STRING}{ENDQUOTES} STR_5815 :{SMALLFONT}{BLACK}Display FPS counter in-game STR_5816 :{SMALLFONT}{BLACK}Sets ratio to scale the game by.{NEWLINE}Most useful when playing in{NEWLINE}high resolutions STR_5817 :{SMALLFONT}{BLACK}Sets UI scaling type. Requires hardware display to be used.{NEWLINE}Linear scaling is smooth, but blurry. Smooth Nearest Neighbour scaling is sharp, but can cause a minor performance hit. -STR_5818 : STR_5819 :{SMALLFONT}{BLACK}[Requires hardware display]{NEWLINE}Pause the game if Steam{NEWLINE}in-game overlay is opened STR_5820 :{SMALLFONT}{BLACK}Minimise the game if focus is{NEWLINE}lost while in fullscreen mode -STR_5821 : STR_5822 :{SMALLFONT}{BLACK}Cycle between day and night.{NEWLINE}Full cycle takes one in-game month STR_5823 :{SMALLFONT}{BLACK}Display banners in uppercase (RCT1 behaviour) STR_5824 :{SMALLFONT}{BLACK}Disables lightning effect{NEWLINE}during a thunderstorm @@ -4203,7 +3363,6 @@ STR_5893 :Exchange Rate STR_5894 :Enter the exchange rate STR_5895 :Save Track STR_5896 :Track save failed! -STR_5897 : STR_5898 :{BLACK}Can't load the track, the file might be {newline}corrupted, broken or missing! STR_5899 :Toggle paint debug window STR_5900 :Use original drawing code diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 8360fdf6fb..a22c47b991 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -129,7 +129,6 @@ static void window_map_toolabort(rct_window *w, rct_widgetindex widgetIndex); static void window_map_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height); static void window_map_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y); static void window_map_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text); -static void window_map_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId); static void window_map_invalidate(rct_window *w); static void window_map_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex); @@ -157,7 +156,7 @@ static rct_window_event_list window_map_events = { window_map_textinput, nullptr, nullptr, - window_map_tooltip, + nullptr, nullptr, nullptr, window_map_invalidate, @@ -667,15 +666,6 @@ static void window_map_textinput(rct_window* w, rct_widgetindex widgetIndex, cha } } -/** - * - * rct2: 0x0068D140 - */ -static void window_map_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId) -{ - set_format_arg(0, rct_string_id, STR_MAP); -} - /** * * rct2: 0x0068CA8F diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 2ee9ffe24f..c1eb59091c 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -1124,7 +1124,7 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex, case WIDX_HEIGHT_LABELS_DROPDOWN: gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL; - gDropdownItemsArgs[0] = STR_UNITS; + gDropdownItemsArgs[0] = STR_HEIGHT_IN_UNITS; gDropdownItemsArgs[1] = STR_REAL_VALUES; window_options_show_dropdown(w, widget, 2); @@ -1754,7 +1754,7 @@ static void window_options_invalidate(rct_window* w) : STR_CELSIUS; // Height: units/real values - window_options_culture_widgets[WIDX_HEIGHT_LABELS].text = gConfigGeneral.show_height_as_units ? STR_UNITS + window_options_culture_widgets[WIDX_HEIGHT_LABELS].text = gConfigGeneral.show_height_as_units ? STR_HEIGHT_IN_UNITS : STR_REAL_VALUES; break; diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 6d74bb8a3c..ee4ae7e172 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -251,8 +251,7 @@ enum STR_MONTH_SHORT_OCT = 819, STR_MONTH_SHORT_NOV = 820, // Unused STR_MONTH_SHORT_DEC = 821, // Unused - // STR_0822 :Unable to access graphic data file - // STR_0823 :Missing or inaccessible data file + STR_CLOSE_X = 824, STR_CHOSEN_NAME_IN_USE_ALREADY = 825, STR_TOO_MANY_NAMES_DEFINED = 826, @@ -264,22 +263,12 @@ enum STR_ROTATE_TIP = 832, STR_PAUSE_GAME_TIP = 833, STR_DISC_AND_GAME_OPTIONS_TIP = 834, - STR_ERR_GAME_INITIALISATION_FAILED = 835, - // STR_0835 :Game initialisation failed - // STR_0836 :Unable to start game in a minimised state - // STR_0837 :Unable to initialise graphics system - // STR_0838 : + STR_RESOLUTION_X_BY_Y = 839, STR_ARG_16_RESOLUTION_X_BY_Y = 840, - // STR_0841 : - // STR_0842 : - // STR_0843 : - // STR_0844 : - // STR_0845 : - // STR_0846 : + STR_ABOUT = 847, - STR_ROLLERCOASTER_TYCOON_2 = 848, - // STR_VERSION_X = 849, + STR_COPYRIGHT_CS = 850, STR_DESIGNED_AND_PROGRAMMED_BY_CS = 851, STR_GRAPHICS_BY_SF = 852, @@ -314,7 +303,7 @@ enum STR_QUIT_SCENARIO_EDITOR = 887, STR_QUIT_ROLLERCOASTER_DESIGNER = 888, STR_QUIT_TRACK_DESIGNS_MANAGER = 889, - // STR_0890 : + STR_SCREENSHOT = 891, STR_SCREENSHOT_SAVED_AS = 892, STR_SCREENSHOT_FAILED = 893, @@ -1523,9 +1512,7 @@ enum STR_SHOP_ITEM_DISPLAY_LEMONADE = 2097, STR_SHOP_ITEM_DISPLAY_EMPTY_BOX = 2098, STR_SHOP_ITEM_DISPLAY_EMPTY_BOTTLE = 2099, - STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO2 = 2100, // Unused - STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO3 = 2101, // Unused - STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO4 = 2102, // Unused + STR_SHOP_ITEM_PRICE_LABEL_PRETZEL = 2103, STR_SHOP_ITEM_PRICE_LABEL_HOT_CHOCOLATE = 2104, STR_SHOP_ITEM_PRICE_LABEL_ICED_TEA = 2105, @@ -1545,9 +1532,7 @@ enum STR_SHOP_ITEM_PRICE_LABEL_EMPTY_JUICE_CUP = 2119, // Empty STR_SHOP_ITEM_PRICE_LABEL_ROAST_SAUSAGE = 2120, STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOWL_BLUE = 2121, // Empty - STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO2 = 2122, // Unused - STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO3 = 2123, // Unused - STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO4 = 2124, // Unused + STR_SHOP_ITEM_SINGULAR_PRETZEL = 2125, STR_SHOP_ITEM_SINGULAR_HOT_CHOCOLATE = 2126, STR_SHOP_ITEM_SINGULAR_ICED_TEA = 2127, @@ -1567,9 +1552,7 @@ enum STR_SHOP_ITEM_SINGULAR_EMPTY_JUICE_CUP = 2141, STR_SHOP_ITEM_SINGULAR_ROAST_SAUSAGE = 2142, STR_SHOP_ITEM_SINGULAR_EMPTY_BOWL_BLUE = 2143, - STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO2 = 2144, // Unused - STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO3 = 2145, // Unused - STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO4 = 2146, // Unused + STR_SHOP_ITEM_PLURAL_PRETZEL = 2147, STR_SHOP_ITEM_PLURAL_HOT_CHOCOLATE = 2148, STR_SHOP_ITEM_PLURAL_ICED_TEA = 2149, @@ -1589,9 +1572,7 @@ enum STR_SHOP_ITEM_PLURAL_EMPTY_JUICE_CUP = 2163, STR_SHOP_ITEM_PLURAL_ROAST_SAUSAGE = 2164, STR_SHOP_ITEM_PLURAL_EMPTY_BOWL_BLUE = 2165, - STR_SHOP_ITEM_INDEFINITE_PHOTO2 = 2166, // Unused - STR_SHOP_ITEM_INDEFINITE_PHOTO3 = 2167, // Unused - STR_SHOP_ITEM_INDEFINITE_PHOTO4 = 2168, // Unused + STR_SHOP_ITEM_INDEFINITE_PRETZEL = 2169, STR_SHOP_ITEM_INDEFINITE_HOT_CHOCOLATE = 2170, STR_SHOP_ITEM_INDEFINITE_ICED_TEA = 2171, @@ -1611,9 +1592,7 @@ enum STR_SHOP_ITEM_INDEFINITE_EMPTY_JUICE_CUP = 2185, STR_SHOP_ITEM_INDEFINITE_ROAST_SAUSAGE = 2186, STR_SHOP_ITEM_INDEFINITE_EMPTY_BOWL_BLUE = 2187, - STR_SHOP_ITEM_DISPLAY_PHOTO2 = 2188, // Unused - STR_SHOP_ITEM_DISPLAY_PHOTO3 = 2189, // Unused - STR_SHOP_ITEM_DISPLAY_PHOTO4 = 2190, // Unused + STR_SHOP_ITEM_DISPLAY_PRETZEL = 2191, STR_SHOP_ITEM_DISPLAY_HOT_CHOCOLATE = 2192, STR_SHOP_ITEM_DISPLAY_ICED_TEA = 2193, @@ -1769,7 +1748,7 @@ enum STR_EUROS = 2343, STR_IMPERIAL = 2344, STR_METRIC = 2345, - STR_DISPLAY = 2346, // Unused + // STR_DISPLAY = 2346, // Unused STR_NEWS_ITEM_GUEST_DROWNED = 2347, STR_STAFF_STATS_TIP = 2348, STR_STAFF_STAT_WAGES = 2349, @@ -1781,8 +1760,7 @@ enum STR_STAFF_STAT_RIDES_FIXED = 2355, STR_STAFF_STAT_RIDES_INSPECTED = 2356, // STR_2357 :House - // STR_2358 :Units - // STR_UNITS = 2358, + STR_HEIGHT_IN_UNITS = 2358, STR_REAL_VALUES = 2359, STR_DISPLAY_RESOLUTION = 2360, STR_TILE_SMOOTHING = 2361, @@ -1879,8 +1857,8 @@ enum STR_FINANCES_FINANCIAL_GRAPH_CASH_LESS_LOAN_POSITIVE = 2452, STR_FINANCES_FINANCIAL_GRAPH_CASH_LESS_LOAN_NEGATIVE = 2453, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE = 2454, - STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_POSITIVE = 2455, // Unused - STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_NEGATIVE = 2456, // Unused + // STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_POSITIVE = 2455, // Unused + // STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_NEGATIVE = 2456, // Unused STR_FINANCES_SHOW_SUMMARY_TAB_TIP = 2457, STR_FINANCES_SHOW_CASH_TAB_TIP = 2458, STR_FINANCES_SHOW_PARK_VALUE_TAB_TIP = 2459, @@ -1909,8 +1887,8 @@ enum STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP = 2482, STR_FINANCES_WEEKLY_PROFIT_POSITIVE = 2483, STR_FINANCES_WEEKLY_PROFIT_LOSS = 2484, - STR_CONTROLS = 2485, // Unused - STR_GENERAL = 2486, // Unused + // STR_CONTROLS = 2485, // Unused + // STR_GENERAL = 2486, // Unused STR_REAL_NAME = 2487, STR_REAL_NAME_TIP = 2488, STR_HOTKEY = 2489, @@ -2172,7 +2150,7 @@ enum STR_OPTIONS_MUSIC_ERR_CSS50_NOT_FOUND_HINT = 2743, // STR_2744 :[ // STR_2745 :\ -// STR_2746 :] + // STR_2746 :] // STR_2747 :{ENDQUOTES} // STR_2748 :Bar STR_MY_NEW_SCENARIO = 2749, @@ -2183,10 +2161,10 @@ enum STR_CHEAT_WATER_PLANTS = 2754, STR_CHEAT_FIX_VANDALISM = 2755, STR_CHEAT_REMOVE_LITTER = 2756, - STR_CHEAT_FORCE_SUN = 2757, // - STR_CHEAT_FORCE_THUNDER = 2758, // - STR_CHEAT_ZERO_CLEARANCE = 2759, // - STR_CHEAT_5K_MONEY = 2760, + // STR_CHEAT_FORCE_SUN = 2757, // + // STR_CHEAT_FORCE_THUNDER = 2758, // + // STR_CHEAT_ZERO_CLEARANCE = 2759, // + // STR_CHEAT_5K_MONEY = 2760, // // STR_2761 : // STR_2762 : // STR_2763 :??? @@ -2407,7 +2385,7 @@ enum STR_MUSIC_STYLE_ROCK_STYLE_3 = 3043, STR_MUSIC_STYLE_CANDY_STYLE = 3044, STR_SELECT_MUSIC_STYLE_TIP = 3045, - STR_THIS_RIDE_CANNOT_BE_MODIFIED = 3046, // Unused + // STR_THIS_RIDE_CANNOT_BE_MODIFIED = 3046, // Unused STR_LOCAL_AUTHORITY_FORBIDS_DEMOLITION_OR_MODIFICATIONS_TO_THIS_RIDE = 3047, STR_MARKETING_CAMPAIGNS_FORBIDDEN_BY_LOCAL_AUTHORITY = 3048, STR_GOLF_HOLE_A = 3049, @@ -2502,30 +2480,17 @@ enum STR_CAPACITY = 3142, STR_SHOW_PEOPLE_ON_MAP_TIP = 3143, STR_SHOW_RIDES_STALLS_ON_MAP_TIP = 3144, - STR_SCROLL_LEFT_TIP = 3145, // Unused - STR_SCROLL_RIGHT_TIP = STR_SCROLL_LEFT_TIP + 1, // Unused - STR_SCROLL_LEFT_FAST_TIP = STR_SCROLL_LEFT_TIP + 2, // Unused - STR_SCROLL_RIGHT_FAST_TIP = STR_SCROLL_LEFT_TIP + 3, // Unused - STR_SCROLL_LEFT_RIGHT_TIP = STR_SCROLL_LEFT_TIP + 4, // Unused - STR_SCROLL_UP_TIP = STR_SCROLL_LEFT_TIP + 5, // Unused - STR_SCROLL_DOWN_TIP = STR_SCROLL_LEFT_TIP + 6, // Unused - STR_SCROLL_UP_FAST_TIP = STR_SCROLL_LEFT_TIP + 7, // Unused - STR_SCROLL_DOWN_FAST_TIP = STR_SCROLL_LEFT_TIP + 8, // Unused - STR_SCROLL_UP_DOWN_TIP = STR_SCROLL_LEFT_TIP + 9, // Unused - // STR_3155 : - // STR_3156 : - STR_MAP = 3157, + STR_GRAPH = 3158, STR_LIST = 3159, STR_SELECT_NUMBER_OF_CIRCUITS_TIP = 3160, - // STR_3161 : + STR_ERR_REASON_NOT_ENOUGH_MEMORY = 3162, - // STR_3163 :Installing new data: + STR_OBJECT_SELECTION_SELECTION_SIZE = 3164, - // STR_PLACEHOLDER = 3165, - // STR_3166 :{BLACK}(ID: - // STR_3167 :{WINDOW_COLOUR_2}Includes: {BLACK}{COMMA16} objects - STR_OBJECT_SELECTION_DESCRIPTION_SCENARIO_TEXT = 3168, + + STR_INCLUDES_X_OBJECTS = 3167, + STR_OBJECT_SELECTION_ERR_OBJECT_DATA_NOT_FOUND = 3169, STR_OBJECT_SELECTION_ERR_NOT_ENOUGH_SPACE_FOR_GRAPHICS = 3170, STR_OBJECT_SELECTION_ERR_TOO_MANY_OF_TYPE_SELECTED = 3171, @@ -2678,11 +2643,9 @@ enum STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN = 3318, STR_WINDOW_SCENARIO_GROUP = 3319, STR_UNABLE_TO_SAVE_SCENARIO_FILE = 3320, - // STR_3321 :New objects installed successfully + STR_OBJECTIVE = 3322, - STR_MISSING_OBJECT_DATA_ID = 3323, - STR_REQUIRES_THE_FOLLOWING_ADDON_PACK = 3324, - STR_REQUIRES_AN_ADDON_PACK = 3325, + STR_WINDOW_NO_IMAGE = 3326, STR_PEEP_SPAWNS_NOT_SET = 3327, STR_CANT_ADVANCE_TO_NEXT_EDITOR_STAGE = 3328, @@ -2694,7 +2657,7 @@ enum STR_SAVE_PLUGIN_DATA_TIP = 3334, STR_ROLLER_COASTER_DESIGNER_SELECT_RIDE_TYPES_VEHICLES = 3335, STR_TRACK_DESIGNS_MANAGER_SELECT_RIDE_TYPE = 3336, - // STR_3337 : + STR_CUSTOM_DESIGNED_LAYOUT = 3338, STR_1_DESIGN_AVAILABLE = 3339, STR_X_DESIGNS_AVAILABLE = 3340, @@ -2719,8 +2682,7 @@ enum STR_NO_TRACK_DESIGNS_OF_THIS_TYPE = 3359, STR_WARNING = 3360, STR_TOO_MANY_TRACK_DESIGNS_OF_THIS_TYPE = 3361, - // STR_3362 : - // STR_3363 : + STR_OBJECT_SELECTION_ADVANCED = 3364, STR_OBJECT_SELECTION_ADVANCED_TIP = 3365, STR_MAP_RIDE = 3366, @@ -2738,14 +2700,13 @@ enum STR_INSTALL_NEW_TRACK_DESIGN_INSTALL = 3378, STR_INSTALL_NEW_TRACK_DESIGN_CANCEL = 3379, STR_UNABLE_TO_INSTALL_THIS_TRACK_DESIGN = 3380, - // STR_3381 :File is not compatible or contains invalid data - // STR_3382 :File copy failed + STR_SELECT_NEW_NAME_FOR_TRACK_DESIGN = 3383, STR_AN_EXISTING_TRACK_DESIGN_ALREADY_HAS_THIS_NAME = 3384, - // STR_3388 :Unable to switch to selected mode + STR_SAVE_TRACK_SCENERY_UNABLE_TO_SELECT_ADDITIONAL_ITEM_OF_SCENERY = 3389, STR_SAVE_TRACK_SCENERY_TOO_MANY_ITEMS_SELECTED = 3390, - // TUTORIAL + STR_CLEAR_SCENERY_TIP = 3437, STR_UNABLE_TO_REMOVE_ALL_SCENERY_FROM_HERE = 3438, STR_CLEAR_SCENERY = 3439, @@ -2763,7 +2724,7 @@ enum STR_RESEARCH_BUTTON_ON_TOOLBAR = 5121, STR_CHEAT_RENEW_RIDES = 5123, - // STR_5124 : + STR_CHEAT_MAKE_DESTRUCTABLE = 5125, STR_OPTIONS_MUSIC_VALUE_RANDOM = 5126, STR_DISABLE_ELEVATION = 5127, @@ -3034,7 +2995,7 @@ enum STR_TITLE_EDITOR_ACTION_RENAME_TIP = 5394, STR_TITLE_EDITOR_ACTION_LOAD_TIP = 5395, STR_TITLE_EDITOR_ACTION_RELOAD_TIP = 5396, - // STR_5397 :Can only be used on the title screen + STR_TITLE_EDITOR_ERR_CANT_EDIT_WHILE_PLAYING = 5398, STR_TITLE_EDITOR_PRESS_STOP_TO_CONTINUE_EDITING = 5399, STR_ERROR_CANT_CHANGE_TITLE_SEQUENCE = 5400, @@ -3131,7 +3092,7 @@ enum STR_DEBUG_DROPDOWN_INVENTIONS_LIST = 5491, STR_DEBUG_DROPDOWN_SCENARIO_OPTIONS = 5492, STR_SEND_MESSAGE = 5493, - // STR_5494 : + STR_PLAYER_LIST = 5495, // Unused STR_PLAYER = 5496, STR_PING = 5497,