Files
@ r21936:7f2a3cd33ca0
Branch filter:
Location: cpp/openttd-patchpack/source/src/group_cmd.cpp - annotation
r21936:7f2a3cd33ca0
20.2 KiB
text/x-c
(svn r27090) -Codechange [FS#5976]: Simplify some hierarchical groups code. (Juanjo)
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 | r6643:fa000ce7441e r6643:fa000ce7441e r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r15027:bb71fdfcc554 r8116:df67d3c5e4fd r6643:fa000ce7441e r16069:5049a8060a4d r8144:1432edd15267 r8212:13ec7a6b1407 r8212:13ec7a6b1407 r8214:9a3935f9ef4e r10208:ef8fcc3dc4ca r11967:df0600d2c7e7 r15847:4a3cf48b2f40 r6643:fa000ce7441e r8264:d493cb51fe8a r8264:d493cb51fe8a r21383:942c32fb8b0e r21383:942c32fb8b0e r10696:8dfe83e30d01 r10696:8dfe83e30d01 r11967:df0600d2c7e7 r11967:df0600d2c7e7 r11967:df0600d2c7e7 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18149:d084e89bff7d r18149:d084e89bff7d r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18141:0f3c67cfc488 r18142:429bd06a51e9 r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18145:767c15d9debd r18146:ad1a95532d6a r18145:767c15d9debd r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18146:ad1a95532d6a r18146:ad1a95532d6a r18146:ad1a95532d6a r18146:ad1a95532d6a r18146:ad1a95532d6a r18146:ad1a95532d6a r18146:ad1a95532d6a r18146:ad1a95532d6a r18146:ad1a95532d6a r18146:ad1a95532d6a r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18145:767c15d9debd r18146:ad1a95532d6a r18145:767c15d9debd r18145:767c15d9debd r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18142:429bd06a51e9 r18144:d858ebd27b4b r18143:604ab298ba0c r18142:429bd06a51e9 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18142:429bd06a51e9 r18142:429bd06a51e9 r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18143:604ab298ba0c r18146:ad1a95532d6a r18143:604ab298ba0c r18143:604ab298ba0c r18146:ad1a95532d6a r18143:604ab298ba0c r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18143:604ab298ba0c r18143:604ab298ba0c r18144:d858ebd27b4b r18144:d858ebd27b4b r18144:d858ebd27b4b r18144:d858ebd27b4b r18144:d858ebd27b4b r18144:d858ebd27b4b r18144:d858ebd27b4b r18144:d858ebd27b4b r18146:ad1a95532d6a r18144:d858ebd27b4b r18144:d858ebd27b4b r18144:d858ebd27b4b r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18149:d084e89bff7d r18141:0f3c67cfc488 r6643:fa000ce7441e r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r18150:7beac77bd864 r6643:fa000ce7441e r6643:fa000ce7441e r18144:d858ebd27b4b r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r18144:d858ebd27b4b r6643:fa000ce7441e r6643:fa000ce7441e r18144:d858ebd27b4b r18145:767c15d9debd r6643:fa000ce7441e r18144:d858ebd27b4b r18145:767c15d9debd r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r7382:750cdd87ddef r10207:a1fc2f2a33db r6643:fa000ce7441e r8253:2016acbc61ce r6643:fa000ce7441e r6643:fa000ce7441e r7382:750cdd87ddef r6643:fa000ce7441e r8258:08100da56269 r7382:750cdd87ddef r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r7197:b688b7300a65 r6643:fa000ce7441e r13057:58af81fcdcf8 r6643:fa000ce7441e r6643:fa000ce7441e r13057:58af81fcdcf8 r13057:58af81fcdcf8 r6643:fa000ce7441e r11090:9276cea703d4 r6643:fa000ce7441e r15027:bb71fdfcc554 r10207:a1fc2f2a33db r6643:fa000ce7441e r9036:e33a0264e0c3 r7382:750cdd87ddef r6643:fa000ce7441e r10207:a1fc2f2a33db r6643:fa000ce7441e r6643:fa000ce7441e r21353:433db3a92931 r6667:b4b3f745e39c r10696:8dfe83e30d01 r10696:8dfe83e30d01 r16069:5049a8060a4d r6643:fa000ce7441e r6643:fa000ce7441e r6950:1a54b1afb12a r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r7197:b688b7300a65 r6643:fa000ce7441e r13057:58af81fcdcf8 r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r13057:58af81fcdcf8 r13057:58af81fcdcf8 r6643:fa000ce7441e r11090:9276cea703d4 r6643:fa000ce7441e r11944:3b8f9f948e8d r11944:3b8f9f948e8d r6643:fa000ce7441e r18366:929c29262060 r18366:929c29262060 r6643:fa000ce7441e r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r18366:929c29262060 r8650:a2162c17e10b r15847:4a3cf48b2f40 r8650:a2162c17e10b r6643:fa000ce7441e r10207:a1fc2f2a33db r10207:a1fc2f2a33db r6643:fa000ce7441e r6643:fa000ce7441e r11917:612c11f7ab47 r6643:fa000ce7441e r10207:a1fc2f2a33db r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6667:b4b3f745e39c r6667:b4b3f745e39c r6643:fa000ce7441e r6643:fa000ce7441e r7382:750cdd87ddef r6667:b4b3f745e39c r16069:5049a8060a4d r6643:fa000ce7441e r6643:fa000ce7441e r6950:1a54b1afb12a r6643:fa000ce7441e r6643:fa000ce7441e r19977:606523dc67fe r7097:1aa026536399 r7097:1aa026536399 r7097:1aa026536399 r7097:1aa026536399 r19977:606523dc67fe r7097:1aa026536399 r7097:1aa026536399 r7097:1aa026536399 r7097:1aa026536399 r6643:fa000ce7441e r6643:fa000ce7441e r21353:433db3a92931 r6643:fa000ce7441e r13057:58af81fcdcf8 r6643:fa000ce7441e r6643:fa000ce7441e r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r13057:58af81fcdcf8 r13057:58af81fcdcf8 r6643:fa000ce7441e r21353:433db3a92931 r6643:fa000ce7441e r21353:433db3a92931 r11944:3b8f9f948e8d r6667:b4b3f745e39c r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r10148:ec65442a5187 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21410:ae5961f02724 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21936:7f2a3cd33ca0 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r10148:ec65442a5187 r7097:1aa026536399 r6643:fa000ce7441e r19237:867c4b3026e7 r16069:5049a8060a4d r6643:fa000ce7441e r6643:fa000ce7441e r6950:1a54b1afb12a r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r6643:fa000ce7441e r6643:fa000ce7441e r13057:58af81fcdcf8 r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r15880:31488f9ccdfa r19235:b28492c2c691 r13057:58af81fcdcf8 r13057:58af81fcdcf8 r6643:fa000ce7441e r11090:9276cea703d4 r6643:fa000ce7441e r19235:b28492c2c691 r6643:fa000ce7441e r6643:fa000ce7441e r19236:ce39f6a41576 r7504:5cc8b8f95e1d r11919:363b629324b9 r11917:612c11f7ab47 r10207:a1fc2f2a33db r6671:62a3a94a8752 r6667:b4b3f745e39c r10207:a1fc2f2a33db r6643:fa000ce7441e r19236:ce39f6a41576 r19236:ce39f6a41576 r19236:ce39f6a41576 r19236:ce39f6a41576 r19236:ce39f6a41576 r19236:ce39f6a41576 r19236:ce39f6a41576 r19236:ce39f6a41576 r6643:fa000ce7441e r19235:b28492c2c691 r6643:fa000ce7441e r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r19235:b28492c2c691 r6643:fa000ce7441e r6643:fa000ce7441e r18150:7beac77bd864 r18143:604ab298ba0c r6643:fa000ce7441e r13024:48c81d0b078a r16069:5049a8060a4d r6643:fa000ce7441e r6643:fa000ce7441e r6950:1a54b1afb12a r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r13057:58af81fcdcf8 r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r13057:58af81fcdcf8 r13057:58af81fcdcf8 r6643:fa000ce7441e r11090:9276cea703d4 r6643:fa000ce7441e r15027:bb71fdfcc554 r15027:bb71fdfcc554 r15027:bb71fdfcc554 r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6773:93083dcf60ec r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r9941:945cc0c6ccbc r14823:60c9b3978fe5 r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6667:b4b3f745e39c r16069:5049a8060a4d r6643:fa000ce7441e r6643:fa000ce7441e r6950:1a54b1afb12a r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r13057:58af81fcdcf8 r6643:fa000ce7441e r6643:fa000ce7441e r18428:50916b734735 r13057:58af81fcdcf8 r13057:58af81fcdcf8 r6643:fa000ce7441e r11090:9276cea703d4 r6643:fa000ce7441e r15027:bb71fdfcc554 r15027:bb71fdfcc554 r6643:fa000ce7441e r18428:50916b734735 r6667:b4b3f745e39c r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r18428:50916b734735 r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r14823:60c9b3978fe5 r6643:fa000ce7441e r6643:fa000ce7441e r6667:b4b3f745e39c r18428:50916b734735 r6667:b4b3f745e39c r6667:b4b3f745e39c r6950:1a54b1afb12a r6667:b4b3f745e39c r6667:b4b3f745e39c r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r6667:b4b3f745e39c r6667:b4b3f745e39c r6667:b4b3f745e39c r6667:b4b3f745e39c r13057:58af81fcdcf8 r6667:b4b3f745e39c r6667:b4b3f745e39c r6667:b4b3f745e39c r6667:b4b3f745e39c r21353:433db3a92931 r13057:58af81fcdcf8 r13057:58af81fcdcf8 r6667:b4b3f745e39c r11090:9276cea703d4 r6667:b4b3f745e39c r11944:3b8f9f948e8d r11944:3b8f9f948e8d r6667:b4b3f745e39c r6667:b4b3f745e39c r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r6667:b4b3f745e39c r19637:4dcae3cb1f19 r10392:1272a9df6a2f r6643:fa000ce7441e r6643:fa000ce7441e r6950:1a54b1afb12a r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r11967:df0600d2c7e7 r6643:fa000ce7441e r18143:604ab298ba0c r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r12290:442d5d533a57 r6643:fa000ce7441e r11919:363b629324b9 r6643:fa000ce7441e r13948:ab833d93e755 r6643:fa000ce7441e r7492:75510449064b r18144:d858ebd27b4b r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r18150:7beac77bd864 r13024:48c81d0b078a r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r12290:442d5d533a57 r6643:fa000ce7441e r12291:690f4158878e r6643:fa000ce7441e r12290:442d5d533a57 r7492:75510449064b r18144:d858ebd27b4b r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r18150:7beac77bd864 r13024:48c81d0b078a r6643:fa000ce7441e r6643:fa000ce7441e r17098:afa706d65a49 r17098:afa706d65a49 r21936:7f2a3cd33ca0 r17098:afa706d65a49 r17098:afa706d65a49 r17098:afa706d65a49 r17098:afa706d65a49 r17098:afa706d65a49 r10207:a1fc2f2a33db r8237:d8e599249043 r21353:433db3a92931 r18145:767c15d9debd r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r8237:d8e599249043 r8237:d8e599249043 r10207:a1fc2f2a33db r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r6643:fa000ce7441e r10207:a1fc2f2a33db r6643:fa000ce7441e r6643:fa000ce7441e r21353:433db3a92931 r21353:433db3a92931 r21354:3262ec0460c5 r21354:3262ec0460c5 r21354:3262ec0460c5 r21354:3262ec0460c5 r21354:3262ec0460c5 r21354:3262ec0460c5 r21353:433db3a92931 r21353:433db3a92931 r21936:7f2a3cd33ca0 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 r21353:433db3a92931 | /* $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 group_cmd.cpp Handling of the engine groups */
#include "stdafx.h"
#include "cmd_helper.h"
#include "command_func.h"
#include "train.h"
#include "vehiclelist.h"
#include "vehicle_func.h"
#include "autoreplace_base.h"
#include "autoreplace_func.h"
#include "string_func.h"
#include "company_func.h"
#include "core/pool_func.hpp"
#include "order_backup.h"
#include "table/strings.h"
#include "safeguards.h"
GroupID _new_group_id;
GroupPool _group_pool("Group");
INSTANTIATE_POOL_METHODS(Group)
GroupStatistics::GroupStatistics()
{
this->num_engines = CallocT<uint16>(Engine::GetPoolSize());
}
GroupStatistics::~GroupStatistics()
{
free(this->num_engines);
}
/**
* Clear all caches.
*/
void GroupStatistics::Clear()
{
this->num_vehicle = 0;
this->num_profit_vehicle = 0;
this->profit_last_year = 0;
/* This is also called when NewGRF change. So the number of engines might have changed. Reallocate. */
free(this->num_engines);
this->num_engines = CallocT<uint16>(Engine::GetPoolSize());
}
/**
* Returns the GroupStatistics for a specific group.
* @param company Owner of the group.
* @param id_g GroupID of the group.
* @param type VehicleType of the vehicles in the group.
* @return Statistics for the group.
*/
/* static */ GroupStatistics &GroupStatistics::Get(CompanyID company, GroupID id_g, VehicleType type)
{
if (Group::IsValidID(id_g)) {
Group *g = Group::Get(id_g);
assert(g->owner == company);
assert(g->vehicle_type == type);
return g->statistics;
}
if (IsDefaultGroupID(id_g)) return Company::Get(company)->group_default[type];
if (IsAllGroupID(id_g)) return Company::Get(company)->group_all[type];
NOT_REACHED();
}
/**
* Returns the GroupStatistic for the group of a vehicle.
* @param v Vehicle.
* @return GroupStatistics for the group of the vehicle.
*/
/* static */ GroupStatistics &GroupStatistics::Get(const Vehicle *v)
{
return GroupStatistics::Get(v->owner, v->group_id, v->type);
}
/**
* Returns the GroupStatistic for the ALL_GROUPO of a vehicle type.
* @param v Vehicle.
* @return GroupStatistics for the ALL_GROUP of the vehicle type.
*/
/* static */ GroupStatistics &GroupStatistics::GetAllGroup(const Vehicle *v)
{
return GroupStatistics::Get(v->owner, ALL_GROUP, v->type);
}
/**
* Update all caches after loading a game, changing NewGRF etc..
*/
/* static */ void GroupStatistics::UpdateAfterLoad()
{
/* Set up the engine count for all companies */
Company *c;
FOR_ALL_COMPANIES(c) {
for (VehicleType type = VEH_BEGIN; type < VEH_COMPANY_END; type++) {
c->group_all[type].Clear();
c->group_default[type].Clear();
}
}
/* Recalculate */
Group *g;
FOR_ALL_GROUPS(g) {
g->statistics.Clear();
}
const Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (!v->IsEngineCountable()) continue;
GroupStatistics::CountEngine(v, 1);
if (v->IsPrimaryVehicle()) GroupStatistics::CountVehicle(v, 1);
}
FOR_ALL_COMPANIES(c) {
GroupStatistics::UpdateAutoreplace(c->index);
}
}
/**
* Update num_vehicle when adding or removing a vehicle.
* @param v Vehicle to count.
* @param delta +1 to add, -1 to remove.
*/
/* static */ void GroupStatistics::CountVehicle(const Vehicle *v, int delta)
{
assert(delta == 1 || delta == -1);
GroupStatistics &stats_all = GroupStatistics::GetAllGroup(v);
GroupStatistics &stats = GroupStatistics::Get(v);
stats_all.num_vehicle += delta;
stats.num_vehicle += delta;
if (v->age > VEHICLE_PROFIT_MIN_AGE) {
stats_all.num_profit_vehicle += delta;
stats_all.profit_last_year += v->GetDisplayProfitLastYear() * delta;
stats.num_profit_vehicle += delta;
stats.profit_last_year += v->GetDisplayProfitLastYear() * delta;
}
}
/**
* Update num_engines when adding/removing an engine.
* @param v Engine to count.
* @param delta +1 to add, -1 to remove.
*/
/* static */ void GroupStatistics::CountEngine(const Vehicle *v, int delta)
{
assert(delta == 1 || delta == -1);
GroupStatistics::GetAllGroup(v).num_engines[v->engine_type] += delta;
GroupStatistics::Get(v).num_engines[v->engine_type] += delta;
}
/**
* Add a vehicle to the profit sum of its group.
*/
/* static */ void GroupStatistics::VehicleReachedProfitAge(const Vehicle *v)
{
GroupStatistics &stats_all = GroupStatistics::GetAllGroup(v);
GroupStatistics &stats = GroupStatistics::Get(v);
stats_all.num_profit_vehicle++;
stats_all.profit_last_year += v->GetDisplayProfitLastYear();
stats.num_profit_vehicle++;
stats.profit_last_year += v->GetDisplayProfitLastYear();
}
/**
* Recompute the profits for all groups.
*/
/* static */ void GroupStatistics::UpdateProfits()
{
/* Set up the engine count for all companies */
Company *c;
FOR_ALL_COMPANIES(c) {
for (VehicleType type = VEH_BEGIN; type < VEH_COMPANY_END; type++) {
c->group_all[type].ClearProfits();
c->group_default[type].ClearProfits();
}
}
/* Recalculate */
Group *g;
FOR_ALL_GROUPS(g) {
g->statistics.ClearProfits();
}
const Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->IsPrimaryVehicle() && v->age > VEHICLE_PROFIT_MIN_AGE) GroupStatistics::VehicleReachedProfitAge(v);
}
}
/**
* Update autoreplace_defined and autoreplace_finished of all statistics of a company.
* @param company Company to update statistics for.
*/
/* static */ void GroupStatistics::UpdateAutoreplace(CompanyID company)
{
/* Set up the engine count for all companies */
Company *c = Company::Get(company);
for (VehicleType type = VEH_BEGIN; type < VEH_COMPANY_END; type++) {
c->group_all[type].ClearAutoreplace();
c->group_default[type].ClearAutoreplace();
}
/* Recalculate */
Group *g;
FOR_ALL_GROUPS(g) {
if (g->owner != company) continue;
g->statistics.ClearAutoreplace();
}
for (EngineRenewList erl = c->engine_renew_list; erl != NULL; erl = erl->next) {
const Engine *e = Engine::Get(erl->from);
GroupStatistics &stats = GroupStatistics::Get(company, erl->group_id, e->type);
if (!stats.autoreplace_defined) {
stats.autoreplace_defined = true;
stats.autoreplace_finished = true;
}
if (stats.num_engines[erl->from] > 0) stats.autoreplace_finished = false;
}
}
/**
* Update the num engines of a groupID. Decrease the old one and increase the new one
* @note called in SetTrainGroupID and UpdateTrainGroupID
* @param v Vehicle we have to update
* @param old_g index of the old group
* @param new_g index of the new group
*/
static inline void UpdateNumEngineGroup(const Vehicle *v, GroupID old_g, GroupID new_g)
{
if (old_g != new_g) {
/* Decrease the num engines in the old group */
GroupStatistics::Get(v->owner, old_g, v->type).num_engines[v->engine_type]--;
/* Increase the num engines in the new group */
GroupStatistics::Get(v->owner, new_g, v->type).num_engines[v->engine_type]++;
}
}
Group::Group(Owner owner)
{
this->owner = owner;
}
Group::~Group()
{
free(this->name);
}
/**
* Create a new vehicle group.
* @param tile unused
* @param flags type of operation
* @param p1 vehicle type
* @param p2 unused
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdCreateGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
VehicleType vt = Extract<VehicleType, 0, 3>(p1);
if (!IsCompanyBuildableVehicleType(vt)) return CMD_ERROR;
if (!Group::CanAllocateItem()) return CMD_ERROR;
if (flags & DC_EXEC) {
Group *g = new Group(_current_company);
g->replace_protection = false;
g->vehicle_type = vt;
g->parent = INVALID_GROUP;
_new_group_id = g->index;
InvalidateWindowData(GetWindowClassForVehicleType(vt), VehicleListIdentifier(VL_GROUP_LIST, vt, _current_company).Pack());
}
return CommandCost();
}
/**
* Add all vehicles in the given group to the default group and then deletes the group.
* @param tile unused
* @param flags type of operation
* @param p1 index of array group
* - p1 bit 0-15 : GroupID
* @param p2 unused
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdDeleteGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
Group *g = Group::GetIfValid(p1);
if (g == NULL || g->owner != _current_company) return CMD_ERROR;
/* Remove all vehicles from the group */
DoCommand(0, p1, 0, flags, CMD_REMOVE_ALL_VEHICLES_GROUP);
/* Delete sub-groups */
Group *gp;
FOR_ALL_GROUPS(gp) {
if (gp->parent == g->index) {
DoCommand(0, gp->index, 0, flags, CMD_DELETE_GROUP);
}
}
if (flags & DC_EXEC) {
/* Update backupped orders if needed */
OrderBackup::ClearGroup(g->index);
/* If we set an autoreplace for the group we delete, remove it. */
if (_current_company < MAX_COMPANIES) {
Company *c;
EngineRenew *er;
c = Company::Get(_current_company);
FOR_ALL_ENGINE_RENEWS(er) {
if (er->group_id == g->index) RemoveEngineReplacementForCompany(c, er->from, g->index, flags);
}
}
VehicleType vt = g->vehicle_type;
/* Delete the Replace Vehicle Windows */
DeleteWindowById(WC_REPLACE_VEHICLE, g->vehicle_type);
delete g;
InvalidateWindowData(GetWindowClassForVehicleType(vt), VehicleListIdentifier(VL_GROUP_LIST, vt, _current_company).Pack());
}
return CommandCost();
}
static bool IsUniqueGroupNameForVehicleType(const char *name, VehicleType type)
{
const Group *g;
FOR_ALL_GROUPS(g) {
if (g->name != NULL && g->vehicle_type == type && strcmp(g->name, name) == 0) return false;
}
return true;
}
/**
* Alter a group
* @param tile unused
* @param flags type of operation
* @param p1 index of array group
* - p1 bit 0-15 : GroupID
* - p1 bit 16: 0 - Rename grouop
* 1 - Set group parent
* @param p2 parent group index
* @param text the new name or an empty string when resetting to the default
* @return the cost of this operation or an error
*/
CommandCost CmdAlterGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
Group *g = Group::GetIfValid(GB(p1, 0, 16));
if (g == NULL || g->owner != _current_company) return CMD_ERROR;
if (!HasBit(p1, 16)) {
/* Rename group */
bool reset = StrEmpty(text);
if (!reset) {
if (Utf8StringLength(text) >= MAX_LENGTH_GROUP_NAME_CHARS) return CMD_ERROR;
if (!IsUniqueGroupNameForVehicleType(text, g->vehicle_type)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
}
if (flags & DC_EXEC) {
/* Delete the old name */
free(g->name);
/* Assign the new one */
g->name = reset ? NULL : stredup(text);
}
} else {
/* Set group parent */
const Group *pg = Group::GetIfValid(GB(p2, 0, 16));
if (pg != NULL) {
if (pg->owner != _current_company) return CMD_ERROR;
if (pg->vehicle_type != g->vehicle_type) return CMD_ERROR;
/* Ensure request parent isn't child of group.
* This is the only place that infinite loops are prevented. */
if (GroupIsInGroup(pg->index, g->index)) return CMD_ERROR;
}
if (flags & DC_EXEC) {
g->parent = (pg == NULL) ? INVALID_GROUP : pg->index;
}
}
if (flags & DC_EXEC) {
SetWindowDirty(WC_REPLACE_VEHICLE, g->vehicle_type);
InvalidateWindowData(GetWindowClassForVehicleType(g->vehicle_type), VehicleListIdentifier(VL_GROUP_LIST, g->vehicle_type, _current_company).Pack());
}
return CommandCost();
}
/**
* Do add a vehicle to a group.
* @param v Vehicle to add.
* @param new_g Group to add to.
*/
static void AddVehicleToGroup(Vehicle *v, GroupID new_g)
{
GroupStatistics::CountVehicle(v, -1);
switch (v->type) {
default: NOT_REACHED();
case VEH_TRAIN:
SetTrainGroupID(Train::From(v), new_g);
break;
case VEH_ROAD:
case VEH_SHIP:
case VEH_AIRCRAFT:
if (v->IsEngineCountable()) UpdateNumEngineGroup(v, v->group_id, new_g);
v->group_id = new_g;
break;
}
GroupStatistics::CountVehicle(v, 1);
}
/**
* Add a vehicle to a group
* @param tile unused
* @param flags type of operation
* @param p1 index of array group
* - p1 bit 0-15 : GroupID
* @param p2 vehicle to add to a group
* - p2 bit 0-19 : VehicleID
* - p2 bit 31 : Add shared vehicles as well.
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdAddVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
Vehicle *v = Vehicle::GetIfValid(GB(p2, 0, 20));
GroupID new_g = p1;
if (v == NULL || (!Group::IsValidID(new_g) && !IsDefaultGroupID(new_g) && new_g != NEW_GROUP)) return CMD_ERROR;
if (Group::IsValidID(new_g)) {
Group *g = Group::Get(new_g);
if (g->owner != _current_company || g->vehicle_type != v->type) return CMD_ERROR;
}
if (v->owner != _current_company || !v->IsPrimaryVehicle()) return CMD_ERROR;
if (new_g == NEW_GROUP) {
/* Create new group. */
CommandCost ret = CmdCreateGroup(0, flags, v->type, 0, NULL);
if (ret.Failed()) return ret;
new_g = _new_group_id;
}
if (flags & DC_EXEC) {
AddVehicleToGroup(v, new_g);
if (HasBit(p2, 31)) {
/* Add vehicles in the shared order list as well. */
for (Vehicle *v2 = v->FirstShared(); v2 != NULL; v2 = v2->NextShared()) {
if (v2->group_id != new_g) AddVehicleToGroup(v2, new_g);
}
}
GroupStatistics::UpdateAutoreplace(v->owner);
/* Update the Replace Vehicle Windows */
SetWindowDirty(WC_REPLACE_VEHICLE, v->type);
InvalidateWindowData(GetWindowClassForVehicleType(v->type), VehicleListIdentifier(VL_GROUP_LIST, v->type, _current_company).Pack());
}
return CommandCost();
}
/**
* Add all shared vehicles of all vehicles from a group
* @param tile unused
* @param flags type of operation
* @param p1 index of group array
* - p1 bit 0-15 : GroupID
* @param p2 type of vehicles
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdAddSharedVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
VehicleType type = Extract<VehicleType, 0, 3>(p2);
GroupID id_g = p1;
if (!Group::IsValidID(id_g) || !IsCompanyBuildableVehicleType(type)) return CMD_ERROR;
if (flags & DC_EXEC) {
Vehicle *v;
/* Find the first front engine which belong to the group id_g
* then add all shared vehicles of this front engine to the group id_g */
FOR_ALL_VEHICLES(v) {
if (v->type == type && v->IsPrimaryVehicle()) {
if (v->group_id != id_g) continue;
/* For each shared vehicles add it to the group */
for (Vehicle *v2 = v->FirstShared(); v2 != NULL; v2 = v2->NextShared()) {
if (v2->group_id != id_g) DoCommand(tile, id_g, v2->index, flags, CMD_ADD_VEHICLE_GROUP, text);
}
}
}
InvalidateWindowData(GetWindowClassForVehicleType(type), VehicleListIdentifier(VL_GROUP_LIST, type, _current_company).Pack());
}
return CommandCost();
}
/**
* Remove all vehicles from a group
* @param tile unused
* @param flags type of operation
* @param p1 index of group array
* - p1 bit 0-15 : GroupID
* @param p2 unused
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdRemoveAllVehiclesGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
GroupID old_g = p1;
Group *g = Group::GetIfValid(old_g);
if (g == NULL || g->owner != _current_company) return CMD_ERROR;
if (flags & DC_EXEC) {
Vehicle *v;
/* Find each Vehicle that belongs to the group old_g and add it to the default group */
FOR_ALL_VEHICLES(v) {
if (v->IsPrimaryVehicle()) {
if (v->group_id != old_g) continue;
/* Add The Vehicle to the default group */
DoCommand(tile, DEFAULT_GROUP, v->index, flags, CMD_ADD_VEHICLE_GROUP, text);
}
}
InvalidateWindowData(GetWindowClassForVehicleType(g->vehicle_type), VehicleListIdentifier(VL_GROUP_LIST, g->vehicle_type, _current_company).Pack());
}
return CommandCost();
}
/**
* Set replace protection for a group and its sub-groups.
* @param g initial group.
* @param protect 1 to set or 0 to clear protection.
*/
static void SetGroupReplaceProtection(Group *g, bool protect)
{
g->replace_protection = protect;
Group *pg;
FOR_ALL_GROUPS(pg) {
if (pg->parent == g->index) SetGroupReplaceProtection(pg, protect);
}
}
/**
* (Un)set global replace protection from a group
* @param tile unused
* @param flags type of operation
* @param p1 index of group array
* - p1 bit 0-15 : GroupID
* @param p2
* - p2 bit 0 : 1 to set or 0 to clear protection.
* - p2 bit 1 : 1 to apply to sub-groups.
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdSetGroupReplaceProtection(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
Group *g = Group::GetIfValid(p1);
if (g == NULL || g->owner != _current_company) return CMD_ERROR;
if (flags & DC_EXEC) {
if (HasBit(p2, 1)) {
SetGroupReplaceProtection(g, HasBit(p2, 0));
} else {
g->replace_protection = HasBit(p2, 0);
}
SetWindowDirty(GetWindowClassForVehicleType(g->vehicle_type), VehicleListIdentifier(VL_GROUP_LIST, g->vehicle_type, _current_company).Pack());
InvalidateWindowData(WC_REPLACE_VEHICLE, g->vehicle_type);
}
return CommandCost();
}
/**
* Decrease the num_vehicle variable before delete an front engine from a group
* @note Called in CmdSellRailWagon and DeleteLasWagon,
* @param v FrontEngine of the train we want to remove.
*/
void RemoveVehicleFromGroup(const Vehicle *v)
{
if (!v->IsPrimaryVehicle()) return;
if (!IsDefaultGroupID(v->group_id)) GroupStatistics::CountVehicle(v, -1);
}
/**
* Affect the groupID of a train to new_g.
* @note called in CmdAddVehicleGroup and CmdMoveRailVehicle
* @param v First vehicle of the chain.
* @param new_g index of array group
*/
void SetTrainGroupID(Train *v, GroupID new_g)
{
if (!Group::IsValidID(new_g) && !IsDefaultGroupID(new_g)) return;
assert(v->IsFrontEngine() || IsDefaultGroupID(new_g));
for (Vehicle *u = v; u != NULL; u = u->Next()) {
if (u->IsEngineCountable()) UpdateNumEngineGroup(u, u->group_id, new_g);
u->group_id = new_g;
}
/* Update the Replace Vehicle Windows */
GroupStatistics::UpdateAutoreplace(v->owner);
SetWindowDirty(WC_REPLACE_VEHICLE, VEH_TRAIN);
}
/**
* Recalculates the groupID of a train. Should be called each time a vehicle is added
* to/removed from the chain,.
* @note this needs to be called too for 'wagon chains' (in the depot, without an engine)
* @note Called in CmdBuildRailVehicle, CmdBuildRailWagon, CmdMoveRailVehicle, CmdSellRailWagon
* @param v First vehicle of the chain.
*/
void UpdateTrainGroupID(Train *v)
{
assert(v->IsFrontEngine() || v->IsFreeWagon());
GroupID new_g = v->IsFrontEngine() ? v->group_id : (GroupID)DEFAULT_GROUP;
for (Vehicle *u = v; u != NULL; u = u->Next()) {
if (u->IsEngineCountable()) UpdateNumEngineGroup(u, u->group_id, new_g);
u->group_id = new_g;
}
/* Update the Replace Vehicle Windows */
GroupStatistics::UpdateAutoreplace(v->owner);
SetWindowDirty(WC_REPLACE_VEHICLE, VEH_TRAIN);
}
/**
* Get the number of engines with EngineID id_e in the group with GroupID
* id_g and its sub-groups.
* @param company The company the group belongs to
* @param id_g The GroupID of the group used
* @param id_e The EngineID of the engine to count
* @return The number of engines with EngineID id_e in the group
*/
uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e)
{
uint count = 0;
const Engine *e = Engine::Get(id_e);
const Group *g;
FOR_ALL_GROUPS(g) {
if (g->parent == id_g) count += GetGroupNumEngines(company, g->index, id_e);
}
return count + GroupStatistics::Get(company, id_g, e->type).num_engines[id_e];
}
void RemoveAllGroupsForCompany(const CompanyID company)
{
Group *g;
FOR_ALL_GROUPS(g) {
if (company == g->owner) delete g;
}
}
/**
* Test if GroupID group is a descendant of (or is) GroupID search
* @param search The GroupID to search in
* @param group The GroupID to search for
* @return True iff group is search or a descendant of search
*/
bool GroupIsInGroup(GroupID search, GroupID group)
{
if (!Group::IsValidID(search)) return search == group;
do {
if (search == group) return true;
search = Group::Get(search)->parent;
} while (search != INVALID_GROUP);
return false;
}
|