equal
deleted
inserted
replaced
462 if (HasBit(this->u.rail.flags, VRF_REVERSE_DIRECTION)) direction = ReverseDir(direction); |
462 if (HasBit(this->u.rail.flags, VRF_REVERSE_DIRECTION)) direction = ReverseDir(direction); |
463 |
463 |
464 if (is_custom_sprite(img)) { |
464 if (is_custom_sprite(img)) { |
465 base = GetCustomVehicleSprite(this, (Direction)(direction + 4 * IS_CUSTOM_SECONDHEAD_SPRITE(img))); |
465 base = GetCustomVehicleSprite(this, (Direction)(direction + 4 * IS_CUSTOM_SECONDHEAD_SPRITE(img))); |
466 if (base != 0) return base; |
466 if (base != 0) return base; |
467 img = orig_rail_vehicle_info[this->engine_type].image_index; |
467 img = _orig_rail_vehicle_info[this->engine_type].image_index; |
468 } |
468 } |
469 |
469 |
470 base = _engine_sprite_base[img] + ((direction + _engine_sprite_add[img]) & _engine_sprite_and[img]); |
470 base = _engine_sprite_base[img] + ((direction + _engine_sprite_add[img]) & _engine_sprite_and[img]); |
471 |
471 |
472 if (this->cargo.Count() >= this->cargo_cap / 2U) base += _wagon_full_adder[img]; |
472 if (this->cargo.Count() >= this->cargo_cap / 2U) base += _wagon_full_adder[img]; |
481 SpriteID image = 0; |
481 SpriteID image = 0; |
482 |
482 |
483 if (is_custom_sprite(img)) { |
483 if (is_custom_sprite(img)) { |
484 image = GetCustomVehicleIcon(engine, DIR_W); |
484 image = GetCustomVehicleIcon(engine, DIR_W); |
485 if (image == 0) { |
485 if (image == 0) { |
486 img = orig_rail_vehicle_info[engine].image_index; |
486 img = _orig_rail_vehicle_info[engine].image_index; |
487 } else { |
487 } else { |
488 y += _traininfo_vehicle_pitch; |
488 y += _traininfo_vehicle_pitch; |
489 } |
489 } |
490 } |
490 } |
491 if (image == 0) { |
491 if (image == 0) { |
496 DrawSprite(image, pal, x - 14, y); |
496 DrawSprite(image, pal, x - 14, y); |
497 x += 15; |
497 x += 15; |
498 image = 0; |
498 image = 0; |
499 if (is_custom_sprite(img)) { |
499 if (is_custom_sprite(img)) { |
500 image = GetCustomVehicleIcon(engine, DIR_E); |
500 image = GetCustomVehicleIcon(engine, DIR_E); |
501 if (image == 0) img = orig_rail_vehicle_info[engine].image_index; |
501 if (image == 0) img = _orig_rail_vehicle_info[engine].image_index; |
502 } |
502 } |
503 if (image == 0) { |
503 if (image == 0) { |
504 image = |
504 image = |
505 ((6 + _engine_sprite_add[img + 1]) & _engine_sprite_and[img + 1]) + |
505 ((6 + _engine_sprite_add[img + 1]) & _engine_sprite_and[img + 1]) + |
506 _engine_sprite_base[img + 1]; |
506 _engine_sprite_base[img + 1]; |