Files
@ r28475:11127afc698f
Branch filter:
Location: cpp/openttd-patchpack/source/src/cargopacket.h - annotation
r28475:11127afc698f
19.7 KiB
text/x-c
Fix #11785, cf16f45: when bumping aircraft into the air, remove them from the loading vehicle list again
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 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r11969:3526c3cc75dc r8119:8fdb3a371896 r8769:6c1f27d01bf5 r20348:d6fd0cf0c673 r12648:24c912bd53f6 r13217:a7416accbcb8 r20348:d6fd0cf0c673 r25585:53810459092f r7010:fd8e3ec6f727 r13210:6ef3c7aaa995 r27737:728d55b97775 r7380:61767264770c r7380:61767264770c r15882:30fbd9be7c68 r17360:71e102cec3ce r17101:93f76317eea0 r11967:df0600d2c7e7 r7380:61767264770c r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20054:152d076eb07b r25585:53810459092f r13203:2e49af5aeba4 r27780:26377b959bf0 r17101:93f76317eea0 r7010:fd8e3ec6f727 r11967:df0600d2c7e7 r13203:2e49af5aeba4 r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27882:e0b47acdb939 r27882:e0b47acdb939 r27882:e0b47acdb939 r27882:e0b47acdb939 r27882:e0b47acdb939 r27905:15ea61ebc2a5 r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27882:e0b47acdb939 r27882:e0b47acdb939 r27882:e0b47acdb939 r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27882:e0b47acdb939 r27891:d136291fa90f r7010:fd8e3ec6f727 r13203:2e49af5aeba4 r20348:d6fd0cf0c673 r13276:3604b09589ee r13276:3604b09589ee r13203:2e49af5aeba4 r25585:53810459092f r13203:2e49af5aeba4 r13204:037e2fceda8f r27737:728d55b97775 r13203:2e49af5aeba4 r13317:40d17c38b14e r27905:15ea61ebc2a5 r27900:c1b3e22f2156 r27900:c1b3e22f2156 r13203:2e49af5aeba4 r17101:93f76317eea0 r11967:df0600d2c7e7 r7010:fd8e3ec6f727 r17102:d51196d5afa1 r17102:d51196d5afa1 r20051:59772daa559f r20051:59772daa559f r20051:59772daa559f r20419:493e8735e0cc r27891:d136291fa90f r20419:493e8735e0cc r27891:d136291fa90f r27882:e0b47acdb939 r27891:d136291fa90f r27882:e0b47acdb939 r20419:493e8735e0cc r20419:493e8735e0cc r27941:fbe336fa8b4e r27905:15ea61ebc2a5 r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r27941:fbe336fa8b4e r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r20051:59772daa559f r20051:59772daa559f r20051:59772daa559f r27882:e0b47acdb939 r27882:e0b47acdb939 r27882:e0b47acdb939 r27882:e0b47acdb939 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r17102:d51196d5afa1 r13203:2e49af5aeba4 r27737:728d55b97775 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r17101:93f76317eea0 r13203:2e49af5aeba4 r27882:e0b47acdb939 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r20051:59772daa559f r20051:59772daa559f r20051:59772daa559f r20051:59772daa559f r20051:59772daa559f r27882:e0b47acdb939 r20051:59772daa559f r20051:59772daa559f r20051:59772daa559f r20051:59772daa559f r20051:59772daa559f r27717:8f7c1d75f921 r27717:8f7c1d75f921 r27717:8f7c1d75f921 r27717:8f7c1d75f921 r17101:93f76317eea0 r13203:2e49af5aeba4 r27882:e0b47acdb939 r13203:2e49af5aeba4 r27717:8f7c1d75f921 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13289:26a0ed664dc0 r17101:93f76317eea0 r17101:93f76317eea0 r13289:26a0ed664dc0 r27882:e0b47acdb939 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r17101:93f76317eea0 r17101:93f76317eea0 r13289:26a0ed664dc0 r27882:e0b47acdb939 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r17101:93f76317eea0 r17101:93f76317eea0 r13289:26a0ed664dc0 r27882:e0b47acdb939 r13289:26a0ed664dc0 r27882:e0b47acdb939 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r13289:26a0ed664dc0 r27905:15ea61ebc2a5 r13289:26a0ed664dc0 r27905:15ea61ebc2a5 r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r27941:fbe336fa8b4e r13289:26a0ed664dc0 r13289:26a0ed664dc0 r13289:26a0ed664dc0 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r27891:d136291fa90f r20348:d6fd0cf0c673 r27891:d136291fa90f r20348:d6fd0cf0c673 r13203:2e49af5aeba4 r12648:24c912bd53f6 r13285:765ad409980c r13287:52547c48c3ba r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r17101:93f76317eea0 r19944:25a78576fb5e r7010:fd8e3ec6f727 r20348:d6fd0cf0c673 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r17101:93f76317eea0 r20348:d6fd0cf0c673 r20051:59772daa559f r20348:d6fd0cf0c673 r17101:93f76317eea0 r20348:d6fd0cf0c673 r20051:59772daa559f r20348:d6fd0cf0c673 r7010:fd8e3ec6f727 r17101:93f76317eea0 r7010:fd8e3ec6f727 r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r13276:3604b09589ee r27064:9235bbc2bec8 r27737:728d55b97775 r7010:fd8e3ec6f727 r20348:d6fd0cf0c673 r13215:922f97d8d59c r13218:a349a5df045c r17101:93f76317eea0 r20051:59772daa559f r20051:59772daa559f r20051:59772daa559f r13218:a349a5df045c r7010:fd8e3ec6f727 r17101:93f76317eea0 r13295:dd56059817bc r17101:93f76317eea0 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r17355:e67faa335e9c r17355:e67faa335e9c r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r17101:93f76317eea0 r7010:fd8e3ec6f727 r20348:d6fd0cf0c673 r13210:6ef3c7aaa995 r13210:6ef3c7aaa995 r13210:6ef3c7aaa995 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r27717:8f7c1d75f921 r17101:93f76317eea0 r7010:fd8e3ec6f727 r27717:8f7c1d75f921 r13210:6ef3c7aaa995 r27717:8f7c1d75f921 r13210:6ef3c7aaa995 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r13276:3604b09589ee r13276:3604b09589ee r13276:3604b09589ee r20348:d6fd0cf0c673 r13293:58ebfc85fa07 r17101:93f76317eea0 r20348:d6fd0cf0c673 r13293:58ebfc85fa07 r20054:152d076eb07b r23838:bfeaabaa7b1d r20054:152d076eb07b r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r13293:58ebfc85fa07 r13293:58ebfc85fa07 r20051:59772daa559f r13293:58ebfc85fa07 r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20856:bfa55154b686 r20856:bfa55154b686 r20856:bfa55154b686 r13276:3604b09589ee r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r17101:93f76317eea0 r20348:d6fd0cf0c673 r25674:17f973faadc4 r25674:17f973faadc4 r13276:3604b09589ee r20052:c9d8caacda1b r20052:c9d8caacda1b r20052:c9d8caacda1b r20052:c9d8caacda1b r20052:c9d8caacda1b r20054:152d076eb07b r20419:493e8735e0cc r20052:c9d8caacda1b r13276:3604b09589ee r27882:e0b47acdb939 r27882:e0b47acdb939 r20348:d6fd0cf0c673 r27882:e0b47acdb939 r20348:d6fd0cf0c673 r27882:e0b47acdb939 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r17101:93f76317eea0 r17101:93f76317eea0 r13293:58ebfc85fa07 r27882:e0b47acdb939 r13293:58ebfc85fa07 r13293:58ebfc85fa07 r13293:58ebfc85fa07 r13293:58ebfc85fa07 r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20188:c7660e0c9b5b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r13276:3604b09589ee r13282:5abfbbdbe99a r13293:58ebfc85fa07 r13293:58ebfc85fa07 r27905:15ea61ebc2a5 r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r21239:e494030d6ed8 r27890:048a3ce7e01b r27941:fbe336fa8b4e r27905:15ea61ebc2a5 r20054:152d076eb07b r20348:d6fd0cf0c673 r20419:493e8735e0cc r20054:152d076eb07b r13282:5abfbbdbe99a r24252:87c5a0b5d08c r13282:5abfbbdbe99a r17101:93f76317eea0 r17101:93f76317eea0 r17101:93f76317eea0 r13282:5abfbbdbe99a r13282:5abfbbdbe99a r13282:5abfbbdbe99a r27717:8f7c1d75f921 r27717:8f7c1d75f921 r27717:8f7c1d75f921 r27905:15ea61ebc2a5 r27881:3907f653da20 r13282:5abfbbdbe99a r13276:3604b09589ee r13276:3604b09589ee r20348:d6fd0cf0c673 r20349:2189c86179e8 r20348:d6fd0cf0c673 r13276:3604b09589ee r13276:3604b09589ee r13276:3604b09589ee r20348:d6fd0cf0c673 r20054:152d076eb07b r20054:152d076eb07b r20348:d6fd0cf0c673 r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r13276:3604b09589ee r17101:93f76317eea0 r20348:d6fd0cf0c673 r25677:0cd5e22c6355 r25677:0cd5e22c6355 r13282:5abfbbdbe99a r20052:c9d8caacda1b r20052:c9d8caacda1b r20052:c9d8caacda1b r20052:c9d8caacda1b r20054:152d076eb07b r20054:152d076eb07b r20419:493e8735e0cc r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20847:f74050098552 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20847:f74050098552 r20348:d6fd0cf0c673 r20847:f74050098552 r20847:f74050098552 r20847:f74050098552 r24252:87c5a0b5d08c r20847:f74050098552 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r20348:d6fd0cf0c673 r27882:e0b47acdb939 r27882:e0b47acdb939 r20348:d6fd0cf0c673 r27882:e0b47acdb939 r20348:d6fd0cf0c673 r27882:e0b47acdb939 r20348:d6fd0cf0c673 r20054:152d076eb07b r20055:c53a5b6f3871 r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20188:c7660e0c9b5b r20188:c7660e0c9b5b r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20055:c53a5b6f3871 r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r20054:152d076eb07b r27905:15ea61ebc2a5 r27905:15ea61ebc2a5 r23607:36c15679007d r20348:d6fd0cf0c673 r20052:c9d8caacda1b r13282:5abfbbdbe99a r24239:b7f73ee4793d r24239:b7f73ee4793d r17101:93f76317eea0 r17101:93f76317eea0 r17101:93f76317eea0 r13282:5abfbbdbe99a r13282:5abfbbdbe99a r13282:5abfbbdbe99a r27717:8f7c1d75f921 r27717:8f7c1d75f921 r27717:8f7c1d75f921 r27905:15ea61ebc2a5 r27717:8f7c1d75f921 r13282:5abfbbdbe99a r13276:3604b09589ee r13276:3604b09589ee r7010:fd8e3ec6f727 | /*
* 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 cargopacket.h Base class for cargo packets. */
#ifndef CARGOPACKET_H
#define CARGOPACKET_H
#include "core/pool_type.hpp"
#include "economy_type.h"
#include "station_type.h"
#include "order_type.h"
#include "cargo_type.h"
#include "vehicle_type.h"
#include "core/multimap.hpp"
#include "saveload/saveload.h"
/** Unique identifier for a single cargo packet. */
typedef uint32_t CargoPacketID;
struct CargoPacket;
/** Type of the pool for cargo packets for a little over 16 million packets. */
typedef Pool<CargoPacket, CargoPacketID, 1024, 0xFFF000, PT_NORMAL, true, false> CargoPacketPool;
/** The actual pool with cargo packets. */
extern CargoPacketPool _cargopacket_pool;
struct GoodsEntry; // forward-declare for Stage() and RerouteStalePackets()
template <class Tinst, class Tcont> class CargoList;
class StationCargoList; // forward-declare, so we can use it in VehicleCargoList.
extern SaveLoadTable GetCargoPacketDesc();
/**
* Container for cargo from the same location and time.
*/
struct CargoPacket : CargoPacketPool::PoolItem<&_cargopacket_pool> {
private:
/* A mathematical vector from (0,0). */
struct Vector {
int16_t x;
int16_t y;
};
uint16_t count{0}; ///< The amount of cargo in this packet.
uint16_t periods_in_transit{0}; ///< Amount of cargo aging periods this packet has been in transit.
Money feeder_share{0}; ///< Value of feeder pickup to be paid for on delivery of cargo.
TileIndex source_xy{INVALID_TILE}; ///< The origin of the cargo.
Vector travelled{0, 0}; ///< If cargo is in station: the vector from the unload tile to the source tile. If in vehicle: an intermediate value.
SourceID source_id{INVALID_SOURCE}; ///< Index of industry/town/HQ, INVALID_SOURCE if unknown/invalid.
SourceType source_type{SourceType::Industry}; ///< Type of \c source_id.
#ifdef WITH_ASSERT
bool in_vehicle{false}; ///< NOSAVE: Whether this cargo is in a vehicle or not.
#endif /* WITH_ASSERT */
StationID first_station{INVALID_STATION}; ///< The station where the cargo came from first.
StationID next_hop{INVALID_STATION}; ///< Station where the cargo wants to go next.
/** The CargoList caches, thus needs to know about it. */
template <class Tinst, class Tcont> friend class CargoList;
friend class VehicleCargoList;
friend class StationCargoList;
/** We want this to be saved, right? */
friend SaveLoadTable GetCargoPacketDesc();
public:
/** Maximum number of items in a single cargo packet. */
static const uint16_t MAX_COUNT = UINT16_MAX;
CargoPacket();
CargoPacket(StationID first_station, uint16_t count, SourceType source_type, SourceID source_id);
CargoPacket(uint16_t count, uint16_t periods_in_transit, StationID first_station, TileIndex source_xy, Money feeder_share);
CargoPacket(uint16_t count, Money feeder_share, CargoPacket &original);
/** Destroy the packet. */
~CargoPacket() { }
CargoPacket *Split(uint new_size);
void Merge(CargoPacket *cp);
void Reduce(uint count);
/**
* Sets the station where the packet is supposed to go next.
* @param next_hop Next station the packet should go to.
*/
void SetNextHop(StationID next_hop)
{
this->next_hop = next_hop;
}
/**
* Update for the cargo being loaded on this tile.
*
* When a CargoPacket is created, it is moved to a station. But at that
* moment in time it is not known yet at which tile the cargo will be
* picked up. As this tile is used for payment information, we delay
* setting the source_xy till first pickup, getting a better idea where
* a cargo started from.
*
* Further more, we keep track of the amount of tiles the cargo moved
* inside a vehicle. This is used in GetDistance() below.
*
* @param tile Tile the cargo is being picked up from.
*/
void UpdateLoadingTile(TileIndex tile)
{
if (this->source_xy == INVALID_TILE) {
this->source_xy = tile;
}
#ifdef WITH_ASSERT
assert(!this->in_vehicle);
this->in_vehicle = true;
#endif /* WITH_ASSERT */
/* We want to calculate the vector from tile-unload to tile-load. As
* we currently only know the latter, add it. When we know where we unload,
* we subtract is, giving us our vector (unload - load). */
this->travelled.x += TileX(tile);
this->travelled.y += TileY(tile);
}
/**
* Update for the cargo being unloaded on this tile.
*
* @param tile Tile the cargo is being dropped off at.
*/
void UpdateUnloadingTile(TileIndex tile)
{
#ifdef WITH_ASSERT
assert(this->in_vehicle);
this->in_vehicle = false;
#endif /* WITH_ASSERT */
this->travelled.x -= TileX(tile);
this->travelled.y -= TileY(tile);
}
/**
* Adds some feeder share to the packet.
* @param new_share Feeder share to be added.
*/
void AddFeederShare(Money new_share)
{
this->feeder_share += new_share;
}
/**
* Gets the number of 'items' in this packet.
* @return Item count.
*/
inline uint16_t Count() const
{
return this->count;
}
/**
* Gets the amount of money already paid to earlier vehicles in
* the feeder chain.
* @return Feeder share.
*/
inline Money GetFeederShare() const
{
return this->feeder_share;
}
/**
* Gets part of the amount of money already paid to earlier vehicles in
* the feeder chain.
* @param part Amount of cargo to get the share for.
* @return Feeder share for the given amount of cargo.
*/
inline Money GetFeederShare(uint part) const
{
return this->feeder_share * part / static_cast<uint>(this->count);
}
/**
* Gets the number of cargo aging periods this cargo has been in transit.
* By default a period is 2.5 days (CARGO_AGING_TICKS = 185 ticks), however
* vehicle NewGRFs can overide the length of the cargo aging period. The
* value is capped at UINT16_MAX.
* @return Length this cargo has been in transit.
*/
inline uint16_t GetPeriodsInTransit() const
{
return this->periods_in_transit;
}
/**
* Gets the type of the cargo's source. industry, town or head quarter.
* @return Source type.
*/
inline SourceType GetSourceType() const
{
return this->source_type;
}
/**
* Gets the ID of the cargo's source. An IndustryID, TownID or CompanyID.
* @return Source ID.
*/
inline SourceID GetSourceID() const
{
return this->source_id;
}
/**
* Gets the ID of the station where the cargo was loaded for the first time.
* @return StationID.
*/
inline StationID GetFirstStation() const
{
return this->first_station;
}
/**
* Get the current distance the cargo has traveled.
*
* @param current_tile Current tile of the cargo.
* @return uint The distance (in tiles) traveled.
*/
inline uint GetDistance(TileIndex current_tile) const
{
assert(this->source_xy != INVALID_TILE);
#ifdef WITH_ASSERT
assert(this->in_vehicle);
#endif /* WITH_ASSERT */
/* Distance is always requested when the cargo is still inside the
* vehicle. So first finish the calculation for travelled to
* become a vector. */
auto local_travelled = travelled;
local_travelled.x -= TileX(current_tile);
local_travelled.y -= TileY(current_tile);
/* Cargo-movement is a vector that indicates how much the cargo has
* actually traveled in a vehicle. This is the distance you get paid
* for. However, one could construct a route where this vector would
* be really long. To not overpay the player, cap out at the distance
* between source and destination.
*
* This way of calculating is to counter people moving cargo for free
* and instantly in stations, where you deliver it in one part of the
* station and pick it up in another. By using the actual distance
* traveled in a vehicle, using this trick doesn't give you more money.
*
* However, especially in large networks with large transfer station,
* etc, one could actually make the route a lot longer. In that case,
* use the actual distance between source and destination.
*/
uint distance_travelled = abs(local_travelled.x) + abs(local_travelled.y);
uint distance_source_dest = DistanceManhattan(this->source_xy, current_tile);
return std::min(distance_travelled, distance_source_dest);
}
/**
* Gets the ID of station the cargo wants to go next.
* @return Next station for this packets.
*/
inline StationID GetNextHop() const
{
return this->next_hop;
}
static void InvalidateAllFrom(SourceType src_type, SourceID src);
static void InvalidateAllFrom(StationID sid);
static void AfterLoad();
};
/**
* Simple collection class for a list of cargo packets.
* @tparam Tinst Actual instantiation of this cargo list.
*/
template <class Tinst, class Tcont>
class CargoList {
public:
/** The iterator for our container. */
typedef typename Tcont::iterator Iterator;
/** The reverse iterator for our container. */
typedef typename Tcont::reverse_iterator ReverseIterator;
/** The const iterator for our container. */
typedef typename Tcont::const_iterator ConstIterator;
/** The const reverse iterator for our container. */
typedef typename Tcont::const_reverse_iterator ConstReverseIterator;
/** Kind of actions that could be done with packets on move. */
enum MoveToAction {
MTA_BEGIN = 0,
MTA_TRANSFER = 0, ///< Transfer the cargo to the station.
MTA_DELIVER, ///< Deliver the cargo to some town or industry.
MTA_KEEP, ///< Keep the cargo in the vehicle.
MTA_LOAD, ///< Load the cargo from the station.
MTA_END,
NUM_MOVE_TO_ACTION = MTA_END
};
protected:
uint count; ///< Cache for the number of cargo entities.
uint64_t cargo_periods_in_transit; ///< Cache for the sum of number of cargo aging periods in transit of each entity; comparable to man-hours.
Tcont packets; ///< The cargo packets in this list.
void AddToCache(const CargoPacket *cp);
void RemoveFromCache(const CargoPacket *cp, uint count);
static bool TryMerge(CargoPacket *cp, CargoPacket *icp);
public:
/** Create the cargo list. */
CargoList() {}
~CargoList();
void OnCleanPool();
/**
* Returns a pointer to the cargo packet list (so you can iterate over it etc).
* @return Pointer to the packet list.
*/
inline const Tcont *Packets() const
{
return &this->packets;
}
/**
* Returns average number of cargo aging periods in transit for a cargo entity.
* @return The before mentioned number.
*/
inline uint PeriodsInTransit() const
{
return this->count == 0 ? 0 : this->cargo_periods_in_transit / this->count;
}
void InvalidateCache();
};
typedef std::list<CargoPacket *> CargoPacketList;
/**
* CargoList that is used for vehicles.
*/
class VehicleCargoList : public CargoList<VehicleCargoList, CargoPacketList> {
protected:
/** The (direct) parent of this class. */
typedef CargoList<VehicleCargoList, CargoPacketList> Parent;
Money feeder_share; ///< Cache for the feeder share.
uint action_counts[NUM_MOVE_TO_ACTION]; ///< Counts of cargo to be transferred, delivered, kept and loaded.
template<class Taction>
void ShiftCargo(Taction action);
template<class Taction>
void PopCargo(Taction action);
/**
* Assert that the designation counts add up.
*/
inline void AssertCountConsistency() const
{
assert(this->action_counts[MTA_KEEP] +
this->action_counts[MTA_DELIVER] +
this->action_counts[MTA_TRANSFER] +
this->action_counts[MTA_LOAD] == this->count);
}
void AddToCache(const CargoPacket *cp);
void RemoveFromCache(const CargoPacket *cp, uint count);
void AddToMeta(const CargoPacket *cp, MoveToAction action);
void RemoveFromMeta(const CargoPacket *cp, MoveToAction action, uint count);
static MoveToAction ChooseAction(const CargoPacket *cp, StationID cargo_next,
StationID current_station, bool accepted, StationIDStack next_station);
public:
/** The station cargo list needs to control the unloading. */
friend class StationCargoList;
/** The super class ought to know what it's doing. */
friend class CargoList<VehicleCargoList, CargoPacketList>;
/* So we can use private/protected variables in the saveload code */
friend class SlVehicleCommon;
friend class CargoShift;
friend class CargoTransfer;
friend class CargoDelivery;
template<class Tsource>
friend class CargoRemoval;
friend class CargoReturn;
friend class VehicleCargoReroute;
/**
* Returns the first station of the first cargo packet in this list.
* @return The before mentioned station.
*/
inline StationID GetFirstStation() const
{
return this->count == 0 ? INVALID_STATION : this->packets.front()->first_station;
}
/**
* Returns total sum of the feeder share for all packets.
* @return The before mentioned number.
*/
inline Money GetFeederShare() const
{
return this->feeder_share;
}
/**
* Returns the amount of cargo designated for a given purpose.
* @param action Action the cargo is designated for.
* @return Amount of cargo designated for the given action.
*/
inline uint ActionCount(MoveToAction action) const
{
return this->action_counts[action];
}
/**
* Returns sum of cargo on board the vehicle (ie not only
* reserved).
* @return Cargo on board the vehicle.
*/
inline uint StoredCount() const
{
return this->count - this->action_counts[MTA_LOAD];
}
/**
* Returns sum of cargo, including reserved cargo.
* @return Sum of cargo.
*/
inline uint TotalCount() const
{
return this->count;
}
/**
* Returns sum of reserved cargo.
* @return Sum of reserved cargo.
*/
inline uint ReservedCount() const
{
return this->action_counts[MTA_LOAD];
}
/**
* Returns sum of cargo to be moved out of the vehicle at the current station.
* @return Cargo to be moved.
*/
inline uint UnloadCount() const
{
return this->action_counts[MTA_TRANSFER] + this->action_counts[MTA_DELIVER];
}
/**
* Returns the sum of cargo to be kept in the vehicle at the current station.
* @return Cargo to be kept or loaded.
*/
inline uint RemainingCount() const
{
return this->action_counts[MTA_KEEP] + this->action_counts[MTA_LOAD];
}
void Append(CargoPacket *cp, MoveToAction action = MTA_KEEP);
void AgeCargo();
void InvalidateCache();
bool Stage(bool accepted, StationID current_station, StationIDStack next_station, uint8_t order_flags, const GoodsEntry *ge, CargoPayment *payment, TileIndex current_tile);
/**
* Marks all cargo in the vehicle as to be kept. This is mostly useful for
* loading old savegames. When loading is aborted the reserved cargo has
* to be returned first.
*/
inline void KeepAll()
{
this->action_counts[MTA_DELIVER] = this->action_counts[MTA_TRANSFER] = this->action_counts[MTA_LOAD] = 0;
this->action_counts[MTA_KEEP] = this->count;
}
/* Methods for moving cargo around. First parameter is always maximum
* amount of cargo to be moved. Second parameter is destination (if
* applicable), return value is amount of cargo actually moved. */
template<MoveToAction Tfrom, MoveToAction Tto>
uint Reassign(uint max_move);
uint Return(uint max_move, StationCargoList *dest, StationID next_station, TileIndex current_tile);
uint Unload(uint max_move, StationCargoList *dest, CargoPayment *payment, TileIndex current_tile);
uint Shift(uint max_move, VehicleCargoList *dest);
uint Truncate(uint max_move = UINT_MAX);
uint Reroute(uint max_move, VehicleCargoList *dest, StationID avoid, StationID avoid2, const GoodsEntry *ge);
/**
* Are the two CargoPackets mergeable in the context of
* a list of CargoPackets for a Vehicle?
* @param cp1 First CargoPacket.
* @param cp2 Second CargoPacket.
* @return True if they are mergeable.
*/
static bool AreMergable(const CargoPacket *cp1, const CargoPacket *cp2)
{
return cp1->source_xy == cp2->source_xy &&
cp1->periods_in_transit == cp2->periods_in_transit &&
cp1->source_type == cp2->source_type &&
cp1->first_station == cp2->first_station &&
cp1->source_id == cp2->source_id;
}
};
typedef MultiMap<StationID, CargoPacket *> StationCargoPacketMap;
typedef std::map<StationID, uint> StationCargoAmountMap;
/**
* CargoList that is used for stations.
*/
class StationCargoList : public CargoList<StationCargoList, StationCargoPacketMap> {
protected:
/** The (direct) parent of this class. */
typedef CargoList<StationCargoList, StationCargoPacketMap> Parent;
uint reserved_count; ///< Amount of cargo being reserved for loading.
public:
/** The super class ought to know what it's doing. */
friend class CargoList<StationCargoList, StationCargoPacketMap>;
/* So we can use private/protected variables in the saveload code */
friend class SlStationGoods;
friend class CargoLoad;
friend class CargoTransfer;
template<class Tsource>
friend class CargoRemoval;
friend class CargoReservation;
friend class CargoReturn;
friend class StationCargoReroute;
static void InvalidateAllFrom(SourceType src_type, SourceID src);
template<class Taction>
bool ShiftCargo(Taction &action, StationID next);
template<class Taction>
uint ShiftCargo(Taction action, StationIDStack next, bool include_invalid);
void Append(CargoPacket *cp, StationID next);
/**
* Check for cargo headed for a specific station.
* @param next Station the cargo is headed for.
* @return If there is any cargo for that station.
*/
inline bool HasCargoFor(StationIDStack next) const
{
while (!next.IsEmpty()) {
if (this->packets.find(next.Pop()) != this->packets.end()) return true;
}
/* Packets for INVALID_STATION can go anywhere. */
return this->packets.find(INVALID_STATION) != this->packets.end();
}
/**
* Returns first station of the first cargo packet in this list.
* @return The before mentioned station.
*/
inline StationID GetFirstStation() const
{
return this->count == 0 ? INVALID_STATION : this->packets.begin()->second.front()->first_station;
}
/**
* Returns sum of cargo still available for loading at the sation.
* (i.e. not counting cargo which is already reserved for loading)
* @return Cargo on board the vehicle.
*/
inline uint AvailableCount() const
{
return this->count;
}
/**
* Returns sum of cargo reserved for loading onto vehicles.
* @return Cargo reserved for loading.
*/
inline uint ReservedCount() const
{
return this->reserved_count;
}
/**
* Returns total count of cargo at the station, including
* cargo which is already reserved for loading.
* @return Total cargo count.
*/
inline uint TotalCount() const
{
return this->count + this->reserved_count;
}
/* Methods for moving cargo around. First parameter is always maximum
* amount of cargo to be moved. Second parameter is destination (if
* applicable), return value is amount of cargo actually moved. */
uint Reserve(uint max_move, VehicleCargoList *dest, StationIDStack next, TileIndex current_tile);
uint Load(uint max_move, VehicleCargoList *dest, StationIDStack next, TileIndex current_tile);
uint Truncate(uint max_move = UINT_MAX, StationCargoAmountMap *cargo_per_source = nullptr);
uint Reroute(uint max_move, StationCargoList *dest, StationID avoid, StationID avoid2, const GoodsEntry *ge);
/**
* Are the two CargoPackets mergeable in the context of
* a list of CargoPackets for a Station?
* @param cp1 First CargoPacket.
* @param cp2 Second CargoPacket.
* @return True if they are mergeable.
*/
static bool AreMergable(const CargoPacket *cp1, const CargoPacket *cp2)
{
return cp1->source_xy == cp2->source_xy &&
cp1->periods_in_transit == cp2->periods_in_transit &&
cp1->source_type == cp2->source_type &&
cp1->first_station == cp2->first_station &&
cp1->source_id == cp2->source_id;
}
};
#endif /* CARGOPACKET_H */
|