Files
@ r20948:b9181458b327
Branch filter:
Location: cpp/openttd-patchpack/source/src/spritecache.cpp - annotation
r20948:b9181458b327
28.7 KiB
text/x-c
(svn r26013) -Revert (r25495) [FS#5684]: Having trains miss a platform that is just being modified is less of a problem than having trains stop twice without moving.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 | r5584:545d748cc681 r5584:545d748cc681 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r6420:01087f989fd1 r5584:545d748cc681 r10039:727fb45b0424 r6852:5b6b567a9e32 r10062:9a719b26b56e r20097:f5dd13cb712b r19022:c323225b1609 r19022:c323225b1609 r6937:bea726150bf3 r10685:9aaca664ce3c r19022:c323225b1609 r6803:f739da58f36c r8264:d493cb51fe8a r20097:f5dd13cb712b r17637:0d7e49507a12 r8264:d493cb51fe8a r6852:5b6b567a9e32 r6852:5b6b567a9e32 r5584:545d748cc681 r10699:4939ee218211 r5584:545d748cc681 r6248:b940b09d7ab8 r8741:1ee8c2ebcabf r9618:f458ccfff999 r6896:34553e48985a r8373:e7760b9340e5 r8741:1ee8c2ebcabf r10699:4939ee218211 r10699:4939ee218211 r19020:24d71054fe13 r6248:b940b09d7ab8 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r7927:8526c948f44a r5584:545d748cc681 r11870:92eb16f6d311 r5584:545d748cc681 r5609:a56ae00a9125 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r6248:b940b09d7ab8 r9146:d873efafcd56 r12078:20df2dd76e0c r6248:b940b09d7ab8 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r19341:f942294567d2 r5584:545d748cc681 r5584:545d748cc681 r6247:96e840dbefcc r19017:1fe1fa4c21dc r5584:545d748cc681 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r11405:7360554fa9a2 r10032:66da33ee7ae2 r11405:7360554fa9a2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10034:721dfc52958a r11405:7360554fa9a2 r10034:721dfc52958a r10034:721dfc52958a r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r11405:7360554fa9a2 r10032:66da33ee7ae2 r10032:66da33ee7ae2 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r20777:b54dc2a3f6fb r20777:b54dc2a3f6fb r5584:545d748cc681 r5584:545d748cc681 r7576:a927e2079d63 r5584:545d748cc681 r5584:545d748cc681 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r15087:eb029334c019 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19115:e871966d9999 r19115:e871966d9999 r19022:c323225b1609 r19115:e871966d9999 r19115:e871966d9999 r19115:e871966d9999 r19115:e871966d9999 r19115:e871966d9999 r19115:e871966d9999 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19115:e871966d9999 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19022:c323225b1609 r19105:482d1bf0e955 r19105:482d1bf0e955 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19022:c323225b1609 r19022:c323225b1609 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19022:c323225b1609 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19105:482d1bf0e955 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19105:482d1bf0e955 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r17040:516f3959e3ff r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r17040:516f3959e3ff r17040:516f3959e3ff r17040:516f3959e3ff r17040:516f3959e3ff r17040:516f3959e3ff r17040:516f3959e3ff r17040:516f3959e3ff r17040:516f3959e3ff r5584:545d748cc681 r7570:d6777a99c723 r9390:aab57f0a7820 r5584:545d748cc681 r19017:1fe1fa4c21dc r10685:9aaca664ce3c r10685:9aaca664ce3c r5962:31dc20bb1404 r10685:9aaca664ce3c r5584:545d748cc681 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19020:24d71054fe13 r19030:677375fa2cd6 r19030:677375fa2cd6 r19030:677375fa2cd6 r19030:677375fa2cd6 r19030:677375fa2cd6 r19030:677375fa2cd6 r19030:677375fa2cd6 r5584:545d748cc681 r19022:c323225b1609 r19018:e354461045c3 r10359:36d7a611e1f5 r17041:26e46902361b r10359:36d7a611e1f5 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19944:25a78576fb5e r19022:c323225b1609 r19018:e354461045c3 r19018:e354461045c3 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19018:e354461045c3 r19022:c323225b1609 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19018:e354461045c3 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r19022:c323225b1609 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r20477:9b737ef24dcc r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r5584:545d748cc681 r9390:aab57f0a7820 r5584:545d748cc681 r19017:1fe1fa4c21dc r19020:24d71054fe13 r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19020:24d71054fe13 r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19020:24d71054fe13 r19020:24d71054fe13 r19017:1fe1fa4c21dc r10685:9aaca664ce3c r10685:9aaca664ce3c r5584:545d748cc681 r5584:545d748cc681 r9470:75edf93b1c69 r5584:545d748cc681 r5584:545d748cc681 r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r7570:d6777a99c723 r5584:545d748cc681 r19017:1fe1fa4c21dc r5584:545d748cc681 r6908:7e03190d606c r10685:9aaca664ce3c r10686:14037a069074 r19020:24d71054fe13 r6896:34553e48985a r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5587:034e5e185dc2 r5584:545d748cc681 r8435:c2fea801325e r5587:034e5e185dc2 r5584:545d748cc681 r7570:d6777a99c723 r5584:545d748cc681 r5584:545d748cc681 r6896:34553e48985a r10056:7a18efcd8edb r10686:14037a069074 r19020:24d71054fe13 r5584:545d748cc681 r5584:545d748cc681 r12004:b14d224b7865 r12004:b14d224b7865 r12004:b14d224b7865 r12004:b14d224b7865 r12004:b14d224b7865 r12004:b14d224b7865 r12004:b14d224b7865 r5584:545d748cc681 r12004:b14d224b7865 r12004:b14d224b7865 r12004:b14d224b7865 r12004:b14d224b7865 r5584:545d748cc681 r10647:62911ec68e89 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r9390:aab57f0a7820 r5584:545d748cc681 r9390:aab57f0a7820 r10647:62911ec68e89 r5584:545d748cc681 r8562:1f7710ea9740 r5584:545d748cc681 r8562:1f7710ea9740 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r6247:96e840dbefcc r5584:545d748cc681 r6420:01087f989fd1 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r11870:92eb16f6d311 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r6420:01087f989fd1 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r15610:623a23fb6560 r15610:623a23fb6560 r15613:193c12018337 r15613:193c12018337 r6247:96e840dbefcc r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r11870:92eb16f6d311 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r10647:62911ec68e89 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r6420:01087f989fd1 r5584:545d748cc681 r5584:545d748cc681 r6420:01087f989fd1 r8741:1ee8c2ebcabf r5584:545d748cc681 r6420:01087f989fd1 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r6420:01087f989fd1 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r6420:01087f989fd1 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r19017:1fe1fa4c21dc r6247:96e840dbefcc r5584:545d748cc681 r5587:034e5e185dc2 r5584:545d748cc681 r5584:545d748cc681 r11870:92eb16f6d311 r5584:545d748cc681 r5584:545d748cc681 r19017:1fe1fa4c21dc r5584:545d748cc681 r19017:1fe1fa4c21dc r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r6420:01087f989fd1 r6420:01087f989fd1 r10236:993bcc06ffa8 r5584:545d748cc681 r19017:1fe1fa4c21dc r5584:545d748cc681 r5584:545d748cc681 r13499:0af2aac7f5aa r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r12004:b14d224b7865 r12004:b14d224b7865 r12004:b14d224b7865 r5584:545d748cc681 r5584:545d748cc681 r10647:62911ec68e89 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r6420:01087f989fd1 r5584:545d748cc681 r5584:545d748cc681 r6420:01087f989fd1 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r6420:01087f989fd1 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r15610:623a23fb6560 r15610:623a23fb6560 r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r13060:e57594b0ca84 r10685:9aaca664ce3c r15613:193c12018337 r15613:193c12018337 r17041:26e46902361b r10685:9aaca664ce3c r13086:71e929261037 r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10686:14037a069074 r11051:196d2e88e725 r11051:196d2e88e725 r17041:26e46902361b r11051:196d2e88e725 r10685:9aaca664ce3c r10686:14037a069074 r10686:14037a069074 r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r15569:7f2810d85ccf r10685:9aaca664ce3c r17041:26e46902361b r10685:9aaca664ce3c r10685:9aaca664ce3c r17041:26e46902361b r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r5584:545d748cc681 r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r5584:545d748cc681 r19902:e42f89309b13 r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r5584:545d748cc681 r10685:9aaca664ce3c r10685:9aaca664ce3c r10685:9aaca664ce3c r5584:545d748cc681 r10685:9aaca664ce3c r10685:9aaca664ce3c r17041:26e46902361b r5584:545d748cc681 r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r5584:545d748cc681 r17041:26e46902361b r17041:26e46902361b r5584:545d748cc681 r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r17041:26e46902361b r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r18461:b013cc5efff8 r5584:545d748cc681 r6420:01087f989fd1 r19341:f942294567d2 r19873:4130677c0949 r19341:f942294567d2 r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r19341:f942294567d2 r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20113:c196e1b4b4a3 r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r20097:f5dd13cb712b r19341:f942294567d2 r5584:545d748cc681 r6420:01087f989fd1 r19341:f942294567d2 r6420:01087f989fd1 r5584:545d748cc681 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r11202:ec3713bd39fb r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r19029:126cc88b18b2 r18461:b013cc5efff8 r18461:b013cc5efff8 r18461:b013cc5efff8 r19022:c323225b1609 | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file spritecache.cpp Caching of sprites. */
#include "stdafx.h"
#include "fileio_func.h"
#include "spriteloader/grf.hpp"
#include "gfx_func.h"
#include "error.h"
#include "zoom_func.h"
#include "settings_type.h"
#include "blitter/factory.hpp"
#include "core/math_func.hpp"
#include "core/mem_func.hpp"
#include "table/sprites.h"
#include "table/strings.h"
#include "table/palette_convert.h"
/* Default of 4MB spritecache */
uint _sprite_cache_size = 4;
typedef SimpleTinyEnumT<SpriteType, byte> SpriteTypeByte;
struct SpriteCache {
void *ptr;
size_t file_pos;
uint32 id;
uint16 file_slot;
int16 lru;
SpriteTypeByte type; ///< In some cases a single sprite is misused by two NewGRFs. Once as real sprite and once as recolour sprite. If the recolour sprite gets into the cache it might be drawn as real sprite which causes enormous trouble.
bool warned; ///< True iff the user has been warned about incorrect use of this sprite
byte container_ver; ///< Container version of the GRF the sprite is from.
};
static uint _spritecache_items = 0;
static SpriteCache *_spritecache = NULL;
static inline SpriteCache *GetSpriteCache(uint index)
{
return &_spritecache[index];
}
static inline bool IsMapgenSpriteID(SpriteID sprite)
{
return IsInsideMM(sprite, 4845, 4882);
}
static SpriteCache *AllocateSpriteCache(uint index)
{
if (index >= _spritecache_items) {
/* Add another 1024 items to the 'pool' */
uint items = Align(index + 1, 1024);
DEBUG(sprite, 4, "Increasing sprite cache to %u items (" PRINTF_SIZE " bytes)", items, items * sizeof(*_spritecache));
_spritecache = ReallocT(_spritecache, items);
/* Reset the new items and update the count */
memset(_spritecache + _spritecache_items, 0, (items - _spritecache_items) * sizeof(*_spritecache));
_spritecache_items = items;
}
return GetSpriteCache(index);
}
struct MemBlock {
size_t size;
byte data[];
};
static uint _sprite_lru_counter;
static MemBlock *_spritecache_ptr;
static uint _allocated_sprite_cache_size = 0;
static int _compact_cache_counter;
static void CompactSpriteCache();
static void *AllocSprite(size_t mem_req);
/**
* Skip the given amount of sprite graphics data.
* @param type the type of sprite (compressed etc)
* @param num the amount of sprites to skip
* @return true if the data could be correctly skipped.
*/
bool SkipSpriteData(byte type, uint16 num)
{
if (type & 2) {
FioSkipBytes(num);
} else {
while (num > 0) {
int8 i = FioReadByte();
if (i >= 0) {
int size = (i == 0) ? 0x80 : i;
if (size > num) return false;
num -= size;
FioSkipBytes(size);
} else {
i = -(i >> 3);
num -= i;
FioReadByte();
}
}
}
return true;
}
/* Check if the given Sprite ID exists */
bool SpriteExists(SpriteID id)
{
if (id >= _spritecache_items) return false;
/* Special case for Sprite ID zero -- its position is also 0... */
if (id == 0) return true;
return !(GetSpriteCache(id)->file_pos == 0 && GetSpriteCache(id)->file_slot == 0);
}
/**
* Get the sprite type of a given sprite.
* @param sprite The sprite to look at.
* @return the type of sprite.
*/
SpriteType GetSpriteType(SpriteID sprite)
{
if (!SpriteExists(sprite)) return ST_INVALID;
return GetSpriteCache(sprite)->type;
}
/**
* Get the (FIOS) file slot of a given sprite.
* @param sprite The sprite to look at.
* @return the FIOS file slot
*/
uint GetOriginFileSlot(SpriteID sprite)
{
if (!SpriteExists(sprite)) return 0;
return GetSpriteCache(sprite)->file_slot;
}
/**
* Get a reasonable (upper bound) estimate of the maximum
* SpriteID used in OpenTTD; there will be no sprites with
* a higher SpriteID, although there might be up to roughly
* a thousand unused SpriteIDs below this number.
* @note It's actually the number of spritecache items.
* @return maximum SpriteID
*/
uint GetMaxSpriteID()
{
return _spritecache_items;
}
static bool ResizeSpriteIn(SpriteLoader::Sprite *sprite, ZoomLevel src, ZoomLevel tgt)
{
uint8 scaled_1 = UnScaleByZoom(1, (ZoomLevel)(tgt - src));
/* Check for possible memory overflow. */
if (sprite[src].width * scaled_1 > UINT16_MAX || sprite[src].height * scaled_1 > UINT16_MAX) return false;
sprite[tgt].width = sprite[src].width * scaled_1;
sprite[tgt].height = sprite[src].height * scaled_1;
sprite[tgt].x_offs = sprite[src].x_offs * scaled_1;
sprite[tgt].y_offs = sprite[src].y_offs * scaled_1;
sprite[tgt].AllocateData(tgt, sprite[tgt].width * sprite[tgt].height);
SpriteLoader::CommonPixel *dst = sprite[tgt].data;
for (int y = 0; y < sprite[tgt].height; y++) {
const SpriteLoader::CommonPixel *src_ln = &sprite[src].data[y / scaled_1 * sprite[src].width];
for (int x = 0; x < sprite[tgt].width; x++) {
*dst = src_ln[x / scaled_1];
dst++;
}
}
return true;
}
static void ResizeSpriteOut(SpriteLoader::Sprite *sprite, ZoomLevel zoom)
{
/* Algorithm based on 32bpp_Optimized::ResizeSprite() */
sprite[zoom].width = UnScaleByZoom(sprite[ZOOM_LVL_NORMAL].width, zoom);
sprite[zoom].height = UnScaleByZoom(sprite[ZOOM_LVL_NORMAL].height, zoom);
sprite[zoom].x_offs = UnScaleByZoom(sprite[ZOOM_LVL_NORMAL].x_offs, zoom);
sprite[zoom].y_offs = UnScaleByZoom(sprite[ZOOM_LVL_NORMAL].y_offs, zoom);
sprite[zoom].AllocateData(zoom, sprite[zoom].height * sprite[zoom].width);
SpriteLoader::CommonPixel *dst = sprite[zoom].data;
const SpriteLoader::CommonPixel *src = sprite[zoom - 1].data;
const SpriteLoader::CommonPixel *src_end = src + sprite[zoom - 1].height * sprite[zoom - 1].width;
for (uint y = 0; y < sprite[zoom].height; y++) {
const SpriteLoader::CommonPixel *src_ln = src + sprite[zoom - 1].width;
assert(src_ln <= src_end);
for (uint x = 0; x < sprite[zoom].width; x++) {
assert(src < src_ln);
if (src + 1 != src_ln && (src + 1)->a != 0) {
*dst = *(src + 1);
} else {
*dst = *src;
}
dst++;
src += 2;
}
src = src_ln + sprite[zoom - 1].width;
}
}
static bool PadSingleSprite(SpriteLoader::Sprite *sprite, ZoomLevel zoom, uint pad_left, uint pad_top, uint pad_right, uint pad_bottom)
{
uint width = sprite->width + pad_left + pad_right;
uint height = sprite->height + pad_top + pad_bottom;
if (width > UINT16_MAX || height > UINT16_MAX) return false;
/* Copy source data and reallocate sprite memory. */
SpriteLoader::CommonPixel *src_data = MallocT<SpriteLoader::CommonPixel>(sprite->width * sprite->height);
MemCpyT(src_data, sprite->data, sprite->width * sprite->height);
sprite->AllocateData(zoom, width * height);
/* Copy with padding to destination. */
SpriteLoader::CommonPixel *src = src_data;
SpriteLoader::CommonPixel *data = sprite->data;
for (uint y = 0; y < height; y++) {
if (y < pad_top || pad_bottom + y >= height) {
/* Top/bottom padding. */
MemSetT(data, 0, width);
data += width;
} else {
if (pad_left > 0) {
/* Pad left. */
MemSetT(data, 0, pad_left);
data += pad_left;
}
/* Copy pixels. */
MemCpyT(data, src, sprite->width);
src += sprite->width;
data += sprite->width;
if (pad_right > 0) {
/* Pad right. */
MemSetT(data, 0, pad_right);
data += pad_right;
}
}
}
free(src_data);
/* Update sprite size. */
sprite->width = width;
sprite->height = height;
sprite->x_offs -= pad_left;
sprite->y_offs -= pad_top;
return true;
}
static bool PadSprites(SpriteLoader::Sprite *sprite, uint8 sprite_avail)
{
/* Get minimum top left corner coordinates. */
int min_xoffs = INT32_MAX;
int min_yoffs = INT32_MAX;
for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
if (HasBit(sprite_avail, zoom)) {
min_xoffs = min(min_xoffs, ScaleByZoom(sprite[zoom].x_offs, zoom));
min_yoffs = min(min_yoffs, ScaleByZoom(sprite[zoom].y_offs, zoom));
}
}
/* Get maximum dimensions taking necessary padding at the top left into account. */
int max_width = INT32_MIN;
int max_height = INT32_MIN;
for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
if (HasBit(sprite_avail, zoom)) {
max_width = max(max_width, ScaleByZoom(sprite[zoom].width + sprite[zoom].x_offs - UnScaleByZoom(min_xoffs, zoom), zoom));
max_height = max(max_height, ScaleByZoom(sprite[zoom].height + sprite[zoom].y_offs - UnScaleByZoom(min_yoffs, zoom), zoom));
}
}
/* Pad sprites where needed. */
for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
if (HasBit(sprite_avail, zoom)) {
/* Scaling the sprite dimensions in the blitter is done with rounding up,
* so a negative padding here is not an error. */
int pad_left = max(0, sprite[zoom].x_offs - UnScaleByZoom(min_xoffs, zoom));
int pad_top = max(0, sprite[zoom].y_offs - UnScaleByZoom(min_yoffs, zoom));
int pad_right = max(0, UnScaleByZoom(max_width, zoom) - sprite[zoom].width - pad_left);
int pad_bottom = max(0, UnScaleByZoom(max_height, zoom) - sprite[zoom].height - pad_top);
if (pad_left > 0 || pad_right > 0 || pad_top > 0 || pad_bottom > 0) {
if (!PadSingleSprite(&sprite[zoom], zoom, pad_left, pad_top, pad_right, pad_bottom)) return false;
}
}
}
return true;
}
static bool ResizeSprites(SpriteLoader::Sprite *sprite, uint8 sprite_avail, uint32 file_slot, uint32 file_pos)
{
/* Create a fully zoomed image if it does not exist */
ZoomLevel first_avail = static_cast<ZoomLevel>(FIND_FIRST_BIT(sprite_avail));
if (first_avail != ZOOM_LVL_NORMAL) {
if (!ResizeSpriteIn(sprite, first_avail, ZOOM_LVL_NORMAL)) return false;
SetBit(sprite_avail, ZOOM_LVL_NORMAL);
}
/* Pad sprites to make sizes match. */
if (!PadSprites(sprite, sprite_avail)) return false;
/* Create other missing zoom levels */
for (ZoomLevel zoom = ZOOM_LVL_OUT_2X; zoom != ZOOM_LVL_END; zoom++) {
if (HasBit(sprite_avail, zoom)) {
/* Check that size and offsets match the fully zoomed image. */
assert(sprite[zoom].width == UnScaleByZoom(sprite[ZOOM_LVL_NORMAL].width, zoom));
assert(sprite[zoom].height == UnScaleByZoom(sprite[ZOOM_LVL_NORMAL].height, zoom));
assert(sprite[zoom].x_offs == UnScaleByZoom(sprite[ZOOM_LVL_NORMAL].x_offs, zoom));
assert(sprite[zoom].y_offs == UnScaleByZoom(sprite[ZOOM_LVL_NORMAL].y_offs, zoom));
}
/* Zoom level is not available, or unusable, so create it */
if (!HasBit(sprite_avail, zoom)) ResizeSpriteOut(sprite, zoom);
}
return true;
}
/**
* Load a recolour sprite into memory.
* @param file_slot GRF we're reading from.
* @param num Size of the sprite in the GRF.
* @return Sprite data.
*/
static void *ReadRecolourSprite(uint16 file_slot, uint num)
{
/* "Normal" recolour sprites are ALWAYS 257 bytes. Then there is a small
* number of recolour sprites that are 17 bytes that only exist in DOS
* GRFs which are the same as 257 byte recolour sprites, but with the last
* 240 bytes zeroed. */
static const uint RECOLOUR_SPRITE_SIZE = 257;
byte *dest = (byte *)AllocSprite(max(RECOLOUR_SPRITE_SIZE, num));
if (_palette_remap_grf[file_slot]) {
byte *dest_tmp = AllocaM(byte, max(RECOLOUR_SPRITE_SIZE, num));
/* Only a few recolour sprites are less than 257 bytes */
if (num < RECOLOUR_SPRITE_SIZE) memset(dest_tmp, 0, RECOLOUR_SPRITE_SIZE);
FioReadBlock(dest_tmp, num);
/* The data of index 0 is never used; "literal 00" according to the (New)GRF specs. */
for (uint i = 1; i < RECOLOUR_SPRITE_SIZE; i++) {
dest[i] = _palmap_w2d[dest_tmp[_palmap_d2w[i - 1] + 1]];
}
} else {
FioReadBlock(dest, num);
}
return dest;
}
/**
* Read a sprite from disk.
* @param sc Location of sprite.
* @param id Sprite number.
* @param sprite_type Type of sprite.
* @param allocator Allocator function to use.
* @return Read sprite data.
*/
static void *ReadSprite(const SpriteCache *sc, SpriteID id, SpriteType sprite_type, AllocatorProc *allocator)
{
uint8 file_slot = sc->file_slot;
size_t file_pos = sc->file_pos;
assert(sprite_type != ST_RECOLOUR);
assert(IsMapgenSpriteID(id) == (sprite_type == ST_MAPGEN));
assert(sc->type == sprite_type);
DEBUG(sprite, 9, "Load sprite %d", id);
SpriteLoader::Sprite sprite[ZOOM_LVL_COUNT];
uint8 sprite_avail = 0;
sprite[ZOOM_LVL_NORMAL].type = sprite_type;
SpriteLoaderGrf sprite_loader(sc->container_ver);
if (sprite_type != ST_MAPGEN && BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 32) {
/* Try for 32bpp sprites first. */
sprite_avail = sprite_loader.LoadSprite(sprite, file_slot, file_pos, sprite_type, true);
}
if (sprite_avail == 0) {
sprite_avail = sprite_loader.LoadSprite(sprite, file_slot, file_pos, sprite_type, false);
}
if (sprite_avail == 0) {
if (sprite_type == ST_MAPGEN) return NULL;
if (id == SPR_IMG_QUERY) usererror("Okay... something went horribly wrong. I couldn't load the fallback sprite. What should I do?");
return (void*)GetRawSprite(SPR_IMG_QUERY, ST_NORMAL, allocator);
}
if (sprite_type == ST_MAPGEN) {
/* Ugly hack to work around the problem that the old landscape
* generator assumes that those sprites are stored uncompressed in
* the memory, and they are only read directly by the code, never
* send to the blitter. So do not send it to the blitter (which will
* result in a data array in the format the blitter likes most), but
* extract the data directly and store that as sprite.
* Ugly: yes. Other solution: no. Blame the original author or
* something ;) The image should really have been a data-stream
* (so type = 0xFF basically). */
uint num = sprite[ZOOM_LVL_NORMAL].width * sprite[ZOOM_LVL_NORMAL].height;
Sprite *s = (Sprite *)allocator(sizeof(*s) + num);
s->width = sprite[ZOOM_LVL_NORMAL].width;
s->height = sprite[ZOOM_LVL_NORMAL].height;
s->x_offs = sprite[ZOOM_LVL_NORMAL].x_offs;
s->y_offs = sprite[ZOOM_LVL_NORMAL].y_offs;
SpriteLoader::CommonPixel *src = sprite[ZOOM_LVL_NORMAL].data;
byte *dest = s->data;
while (num-- > 0) {
*dest++ = src->m;
src++;
}
return s;
}
if (sprite_type == ST_NORMAL) {
if (!ResizeSprites(sprite, sprite_avail, file_slot, sc->id)) {
if (id == SPR_IMG_QUERY) usererror("Okay... something went horribly wrong. I couldn't resize the fallback sprite. What should I do?");
return (void*)GetRawSprite(SPR_IMG_QUERY, ST_NORMAL, allocator);
}
}
return BlitterFactoryBase::GetCurrentBlitter()->Encode(sprite, allocator);
}
/** Map from sprite numbers to position in the GRF file. */
static std::map<uint32, size_t> _grf_sprite_offsets;
/**
* Get the file offset for a specific sprite in the sprite section of a GRF.
* @param id ID of the sprite to look up.
* @return Position of the sprite in the sprite section or SIZE_MAX if no such sprite is present.
*/
size_t GetGRFSpriteOffset(uint32 id)
{
return _grf_sprite_offsets.find(id) != _grf_sprite_offsets.end() ? _grf_sprite_offsets[id] : SIZE_MAX;
}
/**
* Parse the sprite section of GRFs.
* @param container_version Container version of the GRF we're currently processing.
*/
void ReadGRFSpriteOffsets(byte container_version)
{
_grf_sprite_offsets.clear();
if (container_version >= 2) {
/* Seek to sprite section of the GRF. */
size_t data_offset = FioReadDword();
size_t old_pos = FioGetPos();
FioSeekTo(data_offset, SEEK_CUR);
/* Loop over all sprite section entries and store the file
* offset for each newly encountered ID. */
uint32 id, prev_id = 0;
while ((id = FioReadDword()) != 0) {
if (id != prev_id) _grf_sprite_offsets[id] = FioGetPos() - 4;
prev_id = id;
FioSkipBytes(FioReadDword());
}
/* Continue processing the data section. */
FioSeekTo(old_pos, SEEK_SET);
}
}
/**
* Load a real or recolour sprite.
* @param load_index Global sprite index.
* @param file_slot GRF to load from.
* @param file_sprite_id Sprite number in the GRF.
* @param container_version Container version of the GRF.
* @return True if a valid sprite was loaded, false on any error.
*/
bool LoadNextSprite(int load_index, byte file_slot, uint file_sprite_id, byte container_version)
{
size_t file_pos = FioGetPos();
/* Read sprite header. */
uint32 num = container_version >= 2 ? FioReadDword() : FioReadWord();
if (num == 0) return false;
byte grf_type = FioReadByte();
SpriteType type;
void *data = NULL;
if (grf_type == 0xFF) {
/* Some NewGRF files have "empty" pseudo-sprites which are 1
* byte long. Catch these so the sprites won't be displayed. */
if (num == 1) {
FioReadByte();
return false;
}
type = ST_RECOLOUR;
data = ReadRecolourSprite(file_slot, num);
} else if (container_version >= 2 && grf_type == 0xFD) {
if (num != 4) {
/* Invalid sprite section include, ignore. */
FioSkipBytes(num);
return false;
}
/* It is not an error if no sprite with the provided ID is found in the sprite section. */
file_pos = GetGRFSpriteOffset(FioReadDword());
type = ST_NORMAL;
} else {
FioSkipBytes(7);
type = SkipSpriteData(grf_type, num - 8) ? ST_NORMAL : ST_INVALID;
/* Inline sprites are not supported for container version >= 2. */
if (container_version >= 2) return false;
}
if (type == ST_INVALID) return false;
if (load_index >= MAX_SPRITES) {
usererror("Tried to load too many sprites (#%d; max %d)", load_index, MAX_SPRITES);
}
bool is_mapgen = IsMapgenSpriteID(load_index);
if (is_mapgen) {
if (type != ST_NORMAL) usererror("Uhm, would you be so kind not to load a NewGRF that changes the type of the map generator sprites?");
type = ST_MAPGEN;
}
SpriteCache *sc = AllocateSpriteCache(load_index);
sc->file_slot = file_slot;
sc->file_pos = file_pos;
sc->ptr = data;
sc->lru = 0;
sc->id = file_sprite_id;
sc->type = type;
sc->warned = false;
sc->container_ver = container_version;
return true;
}
void DupSprite(SpriteID old_spr, SpriteID new_spr)
{
SpriteCache *scnew = AllocateSpriteCache(new_spr); // may reallocate: so put it first
SpriteCache *scold = GetSpriteCache(old_spr);
scnew->file_slot = scold->file_slot;
scnew->file_pos = scold->file_pos;
scnew->ptr = NULL;
scnew->id = scold->id;
scnew->type = scold->type;
scnew->warned = false;
scnew->container_ver = scold->container_ver;
}
/**
* S_FREE_MASK is used to mask-out lower bits of MemBlock::size
* If they are non-zero, the block is free.
* S_FREE_MASK has to ensure MemBlock is correctly aligned -
* it means 8B (S_FREE_MASK == 7) on 64bit systems!
*/
static const size_t S_FREE_MASK = sizeof(size_t) - 1;
/* to make sure nobody adds things to MemBlock without checking S_FREE_MASK first */
assert_compile(sizeof(MemBlock) == sizeof(size_t));
/* make sure it's a power of two */
assert_compile((sizeof(size_t) & (sizeof(size_t) - 1)) == 0);
static inline MemBlock *NextBlock(MemBlock *block)
{
return (MemBlock*)((byte*)block + (block->size & ~S_FREE_MASK));
}
static size_t GetSpriteCacheUsage()
{
size_t tot_size = 0;
MemBlock *s;
for (s = _spritecache_ptr; s->size != 0; s = NextBlock(s)) {
if (!(s->size & S_FREE_MASK)) tot_size += s->size;
}
return tot_size;
}
void IncreaseSpriteLRU()
{
/* Increase all LRU values */
if (_sprite_lru_counter > 16384) {
SpriteID i;
DEBUG(sprite, 3, "Fixing lru %u, inuse=" PRINTF_SIZE, _sprite_lru_counter, GetSpriteCacheUsage());
for (i = 0; i != _spritecache_items; i++) {
SpriteCache *sc = GetSpriteCache(i);
if (sc->ptr != NULL) {
if (sc->lru >= 0) {
sc->lru = -1;
} else if (sc->lru != -32768) {
sc->lru--;
}
}
}
_sprite_lru_counter = 0;
}
/* Compact sprite cache every now and then. */
if (++_compact_cache_counter >= 740) {
CompactSpriteCache();
_compact_cache_counter = 0;
}
}
/**
* Called when holes in the sprite cache should be removed.
* That is accomplished by moving the cached data.
*/
static void CompactSpriteCache()
{
MemBlock *s;
DEBUG(sprite, 3, "Compacting sprite cache, inuse=" PRINTF_SIZE, GetSpriteCacheUsage());
for (s = _spritecache_ptr; s->size != 0;) {
if (s->size & S_FREE_MASK) {
MemBlock *next = NextBlock(s);
MemBlock temp;
SpriteID i;
/* Since free blocks are automatically coalesced, this should hold true. */
assert(!(next->size & S_FREE_MASK));
/* If the next block is the sentinel block, we can safely return */
if (next->size == 0) break;
/* Locate the sprite belonging to the next pointer. */
for (i = 0; GetSpriteCache(i)->ptr != next->data; i++) {
assert(i != _spritecache_items);
}
GetSpriteCache(i)->ptr = s->data; // Adjust sprite array entry
/* Swap this and the next block */
temp = *s;
memmove(s, next, next->size);
s = NextBlock(s);
*s = temp;
/* Coalesce free blocks */
while (NextBlock(s)->size & S_FREE_MASK) {
s->size += NextBlock(s)->size & ~S_FREE_MASK;
}
} else {
s = NextBlock(s);
}
}
}
/**
* Delete a single entry from the sprite cache.
* @param item Entry to delete.
*/
static void DeleteEntryFromSpriteCache(uint item)
{
/* Mark the block as free (the block must be in use) */
MemBlock *s = (MemBlock*)GetSpriteCache(item)->ptr - 1;
assert(!(s->size & S_FREE_MASK));
s->size |= S_FREE_MASK;
GetSpriteCache(item)->ptr = NULL;
/* And coalesce adjacent free blocks */
for (s = _spritecache_ptr; s->size != 0; s = NextBlock(s)) {
if (s->size & S_FREE_MASK) {
while (NextBlock(s)->size & S_FREE_MASK) {
s->size += NextBlock(s)->size & ~S_FREE_MASK;
}
}
}
}
static void DeleteEntryFromSpriteCache()
{
uint best = UINT_MAX;
int cur_lru;
DEBUG(sprite, 3, "DeleteEntryFromSpriteCache, inuse=" PRINTF_SIZE, GetSpriteCacheUsage());
cur_lru = 0xffff;
for (SpriteID i = 0; i != _spritecache_items; i++) {
SpriteCache *sc = GetSpriteCache(i);
if (sc->type != ST_RECOLOUR && sc->ptr != NULL && sc->lru < cur_lru) {
cur_lru = sc->lru;
best = i;
}
}
/* Display an error message and die, in case we found no sprite at all.
* This shouldn't really happen, unless all sprites are locked. */
if (best == UINT_MAX) error("Out of sprite memory");
DeleteEntryFromSpriteCache(best);
}
static void *AllocSprite(size_t mem_req)
{
mem_req += sizeof(MemBlock);
/* Align this to correct boundary. This also makes sure at least one
* bit is not used, so we can use it for other things. */
mem_req = Align(mem_req, S_FREE_MASK + 1);
for (;;) {
MemBlock *s;
for (s = _spritecache_ptr; s->size != 0; s = NextBlock(s)) {
if (s->size & S_FREE_MASK) {
size_t cur_size = s->size & ~S_FREE_MASK;
/* Is the block exactly the size we need or
* big enough for an additional free block? */
if (cur_size == mem_req ||
cur_size >= mem_req + sizeof(MemBlock)) {
/* Set size and in use */
s->size = mem_req;
/* Do we need to inject a free block too? */
if (cur_size != mem_req) {
NextBlock(s)->size = (cur_size - mem_req) | S_FREE_MASK;
}
return s->data;
}
}
}
/* Reached sentinel, but no block found yet. Delete some old entry. */
DeleteEntryFromSpriteCache();
}
}
/**
* Handles the case when a sprite of different type is requested than is present in the SpriteCache.
* For ST_FONT sprites, it is normal. In other cases, default sprite is loaded instead.
* @param sprite ID of loaded sprite
* @param requested requested sprite type
* @param sc the currently known sprite cache for the requested sprite
* @return fallback sprite
* @note this function will do usererror() in the case the fallback sprite isn't available
*/
static void *HandleInvalidSpriteRequest(SpriteID sprite, SpriteType requested, SpriteCache *sc, AllocatorProc *allocator)
{
static const char * const sprite_types[] = {
"normal", // ST_NORMAL
"map generator", // ST_MAPGEN
"character", // ST_FONT
"recolour", // ST_RECOLOUR
};
SpriteType available = sc->type;
if (requested == ST_FONT && available == ST_NORMAL) {
if (sc->ptr == NULL) sc->type = ST_FONT;
return GetRawSprite(sprite, sc->type, allocator);
}
byte warning_level = sc->warned ? 6 : 0;
sc->warned = true;
DEBUG(sprite, warning_level, "Tried to load %s sprite #%d as a %s sprite. Probable cause: NewGRF interference", sprite_types[available], sprite, sprite_types[requested]);
switch (requested) {
case ST_NORMAL:
if (sprite == SPR_IMG_QUERY) usererror("Uhm, would you be so kind not to load a NewGRF that makes the 'query' sprite a non-normal sprite?");
/* FALL THROUGH */
case ST_FONT:
return GetRawSprite(SPR_IMG_QUERY, ST_NORMAL, allocator);
case ST_RECOLOUR:
if (sprite == PALETTE_TO_DARK_BLUE) usererror("Uhm, would you be so kind not to load a NewGRF that makes the 'PALETTE_TO_DARK_BLUE' sprite a non-remap sprite?");
return GetRawSprite(PALETTE_TO_DARK_BLUE, ST_RECOLOUR, allocator);
case ST_MAPGEN:
/* this shouldn't happen, overriding of ST_MAPGEN sprites is checked in LoadNextSprite()
* (the only case the check fails is when these sprites weren't even loaded...) */
default:
NOT_REACHED();
}
}
/**
* Reads a sprite (from disk or sprite cache).
* If the sprite is not available or of wrong type, a fallback sprite is returned.
* @param sprite Sprite to read.
* @param type Expected sprite type.
* @param allocator Allocator function to use. Set to NULL to use the usual sprite cache.
* @return Sprite raw data
*/
void *GetRawSprite(SpriteID sprite, SpriteType type, AllocatorProc *allocator)
{
assert(type != ST_MAPGEN || IsMapgenSpriteID(sprite));
assert(type < ST_INVALID);
if (!SpriteExists(sprite)) {
DEBUG(sprite, 1, "Tried to load non-existing sprite #%d. Probable cause: Wrong/missing NewGRFs", sprite);
/* SPR_IMG_QUERY is a BIG FAT RED ? */
sprite = SPR_IMG_QUERY;
}
SpriteCache *sc = GetSpriteCache(sprite);
if (sc->type != type) return HandleInvalidSpriteRequest(sprite, type, sc, allocator);
if (allocator == NULL) {
/* Load sprite into/from spritecache */
/* Update LRU */
sc->lru = ++_sprite_lru_counter;
/* Load the sprite, if it is not loaded, yet */
if (sc->ptr == NULL) sc->ptr = ReadSprite(sc, sprite, type, AllocSprite);
return sc->ptr;
} else {
/* Do not use the spritecache, but a different allocator. */
return ReadSprite(sc, sprite, type, allocator);
}
}
static void GfxInitSpriteCache()
{
/* initialize sprite cache heap */
int bpp = BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth();
uint target_size = (bpp > 0 ? _sprite_cache_size * bpp / 8 : 1) * 1024 * 1024;
/* Remember 'target_size' from the previous allocation attempt, so we do not try to reach the target_size multiple times in case of failure. */
static uint last_alloc_attempt = 0;
if (_spritecache_ptr == NULL || (_allocated_sprite_cache_size != target_size && target_size != last_alloc_attempt)) {
delete[] reinterpret_cast<byte *>(_spritecache_ptr);
last_alloc_attempt = target_size;
_allocated_sprite_cache_size = target_size;
do {
try {
/* Try to allocate 50% more to make sure we do not allocate almost all available. */
_spritecache_ptr = reinterpret_cast<MemBlock *>(new byte[_allocated_sprite_cache_size + _allocated_sprite_cache_size / 2]);
} catch (std::bad_alloc &) {
_spritecache_ptr = NULL;
}
if (_spritecache_ptr != NULL) {
/* Allocation succeeded, but we wanted less. */
delete[] reinterpret_cast<byte *>(_spritecache_ptr);
_spritecache_ptr = reinterpret_cast<MemBlock *>(new byte[_allocated_sprite_cache_size]);
} else if (_allocated_sprite_cache_size < 2 * 1024 * 1024) {
usererror("Cannot allocate spritecache");
} else {
/* Try again to allocate half. */
_allocated_sprite_cache_size >>= 1;
}
} while (_spritecache_ptr == NULL);
if (_allocated_sprite_cache_size != target_size) {
DEBUG(misc, 0, "Not enough memory to allocate %d MiB of spritecache. Spritecache was reduced to %d MiB.", target_size / 1024 / 1024, _allocated_sprite_cache_size / 1024 / 1024);
ErrorMessageData msg(STR_CONFIG_ERROR_OUT_OF_MEMORY, STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG);
msg.SetDParam(0, target_size);
msg.SetDParam(1, _allocated_sprite_cache_size);
ScheduleErrorMessage(msg);
}
}
/* A big free block */
_spritecache_ptr->size = (_allocated_sprite_cache_size - sizeof(MemBlock)) | S_FREE_MASK;
/* Sentinel block (identified by size == 0) */
NextBlock(_spritecache_ptr)->size = 0;
}
void GfxInitSpriteMem()
{
GfxInitSpriteCache();
/* Reset the spritecache 'pool' */
free(_spritecache);
_spritecache_items = 0;
_spritecache = NULL;
_compact_cache_counter = 0;
}
/**
* Remove all encoded sprites from the sprite cache without
* discarding sprite location information.
*/
void GfxClearSpriteCache()
{
/* Clear sprite ptr for all cached items */
for (uint i = 0; i != _spritecache_items; i++) {
SpriteCache *sc = GetSpriteCache(i);
if (sc->type != ST_RECOLOUR && sc->ptr != NULL) DeleteEntryFromSpriteCache(i);
}
}
/* static */ ReusableBuffer<SpriteLoader::CommonPixel> SpriteLoader::Sprite::buffer[ZOOM_LVL_COUNT];
|