equal
deleted
inserted
replaced
362 SetDParam(0, st->index); |
362 SetDParam(0, st->index); |
363 SetDParam(1, st->facilities); |
363 SetDParam(1, st->facilities); |
364 x = DrawString(xb, y, STR_3049_0, 0) + 5; |
364 x = DrawString(xb, y, STR_3049_0, 0) + 5; |
365 |
365 |
366 // show cargo waiting and station ratings |
366 // show cargo waiting and station ratings |
367 for (CargoID j = 0; j != NUM_CARGO; j++) { |
367 for (CargoID j = 0; j < NUM_CARGO; j++) { |
368 uint amount = GB(st->goods[j].waiting_acceptance, 0, 12); |
368 uint amount = GB(st->goods[j].waiting_acceptance, 0, 12); |
369 if (amount != 0) { |
369 if (amount != 0) { |
370 StationsWndShowStationRating(x, y, j, amount, st->goods[j].rating); |
370 StationsWndShowStationRating(x, y, j, amount, st->goods[j].rating); |
371 x += 20; |
371 x += 20; |
372 } |
372 } |
675 int x,y; |
675 int x,y; |
676 int pos; |
676 int pos; |
677 StringID str; |
677 StringID str; |
678 |
678 |
679 num = 1; |
679 num = 1; |
680 for (CargoID i = 0; i != NUM_CARGO; i++) { |
680 for (CargoID i = 0; i < NUM_CARGO; i++) { |
681 if (GB(st->goods[i].waiting_acceptance, 0, 12) != 0) { |
681 if (GB(st->goods[i].waiting_acceptance, 0, 12) != 0) { |
682 num++; |
682 num++; |
683 if (st->goods[i].enroute_from != station_id) num++; |
683 if (st->goods[i].enroute_from != station_id) num++; |
684 } |
684 } |
685 } |
685 } |
699 y = 15; |
699 y = 15; |
700 pos = w->vscroll.pos; |
700 pos = w->vscroll.pos; |
701 |
701 |
702 if (--pos < 0) { |
702 if (--pos < 0) { |
703 str = STR_00D0_NOTHING; |
703 str = STR_00D0_NOTHING; |
704 for (CargoID i = 0; i != NUM_CARGO; i++) { |
704 for (CargoID i = 0; i < NUM_CARGO; i++) { |
705 if (GB(st->goods[i].waiting_acceptance, 0, 12) != 0) str = STR_EMPTY; |
705 if (GB(st->goods[i].waiting_acceptance, 0, 12) != 0) str = STR_EMPTY; |
706 } |
706 } |
707 SetDParam(0, str); |
707 SetDParam(0, str); |
708 DrawString(x, y, STR_0008_WAITING, 0); |
708 DrawString(x, y, STR_0008_WAITING, 0); |
709 y += 10; |
709 y += 10; |
710 } |
710 } |
711 |
711 |
712 for (CargoID i = 0; i != NUM_CARGO && pos > -5; i++) { |
712 for (CargoID i = 0; i < NUM_CARGO && pos > -5; i++) { |
713 uint waiting = GB(st->goods[i].waiting_acceptance, 0, 12); |
713 uint waiting = GB(st->goods[i].waiting_acceptance, 0, 12); |
714 if (waiting == 0) continue; |
714 if (waiting == 0) continue; |
715 |
715 |
716 num = (waiting + 5) / 10; |
716 num = (waiting + 5) / 10; |
717 if (num != 0) { |
717 if (num != 0) { |
751 char *b = _userstring; |
751 char *b = _userstring; |
752 bool first = true; |
752 bool first = true; |
753 |
753 |
754 b = InlineString(b, STR_000C_ACCEPTS); |
754 b = InlineString(b, STR_000C_ACCEPTS); |
755 |
755 |
756 for (CargoID i = 0; i != NUM_CARGO; i++) { |
756 for (CargoID i = 0; i < NUM_CARGO; i++) { |
757 if (b >= endof(_userstring) - 5 - 1) break; |
757 if (b >= endof(_userstring) - 5 - 1) break; |
758 if (st->goods[i].waiting_acceptance & 0x8000) { |
758 if (st->goods[i].waiting_acceptance & 0x8000) { |
759 if (first) { |
759 if (first) { |
760 first = false; |
760 first = false; |
761 } else { |
761 } else { |
774 DrawStringMultiLine(2, 67, STR_SPEC_USERSTRING, 245); |
774 DrawStringMultiLine(2, 67, STR_SPEC_USERSTRING, 245); |
775 } else { |
775 } else { |
776 DrawString(2, 67, STR_3034_LOCAL_RATING_OF_TRANSPORT, 0); |
776 DrawString(2, 67, STR_3034_LOCAL_RATING_OF_TRANSPORT, 0); |
777 |
777 |
778 y = 77; |
778 y = 77; |
779 for (CargoID i = 0; i != NUM_CARGO; i++) { |
779 for (CargoID i = 0; i < NUM_CARGO; i++) { |
780 const CargoSpec *cs = GetCargo(i); |
780 const CargoSpec *cs = GetCargo(i); |
781 if (!cs->IsValid()) continue; |
781 if (!cs->IsValid()) continue; |
782 |
782 |
783 const GoodsEntry *ge = &st->goods[i]; |
783 const GoodsEntry *ge = &st->goods[i]; |
784 if (ge->enroute_from == INVALID_STATION) continue; |
784 if (ge->enroute_from == INVALID_STATION) continue; |