185 break; |
185 break; |
186 |
186 |
187 case VEH_ROAD: DrawRoadVehImage( v, x + 24, sprite_y, 1, WP(w, depot_d).sel); break; |
187 case VEH_ROAD: DrawRoadVehImage( v, x + 24, sprite_y, 1, WP(w, depot_d).sel); break; |
188 case VEH_SHIP: DrawShipImage( v, x + 19, sprite_y - 1, WP(w, depot_d).sel); break; |
188 case VEH_SHIP: DrawShipImage( v, x + 19, sprite_y - 1, WP(w, depot_d).sel); break; |
189 case VEH_AIRCRAFT: { |
189 case VEH_AIRCRAFT: { |
190 const Sprite *spr = GetSprite(GetAircraftImage(v, DIR_W)); |
190 const Sprite *spr = GetSprite(v->GetImage(DIR_W)); |
191 DrawAircraftImage(v, x + 12, |
191 DrawAircraftImage(v, x + 12, |
192 y + max(spr->height + spr->y_offs - 14, 0), // tall sprites needs an y offset |
192 y + max(spr->height + spr->y_offs - 14, 0), // tall sprites needs an y offset |
193 WP(w, depot_d).sel); |
193 WP(w, depot_d).sel); |
194 } break; |
194 } break; |
195 default: NOT_REACHED(); |
195 default: NOT_REACHED(); |
436 |
436 |
437 if (WP(w, depot_d).type == VEH_TRAIN && sel != INVALID_VEHICLE) { |
437 if (WP(w, depot_d).type == VEH_TRAIN && sel != INVALID_VEHICLE) { |
438 WP(w,depot_d).sel = INVALID_VEHICLE; |
438 WP(w,depot_d).sel = INVALID_VEHICLE; |
439 TrainDepotMoveVehicle(v, sel, gdvp.head); |
439 TrainDepotMoveVehicle(v, sel, gdvp.head); |
440 } else if (v != NULL) { |
440 } else if (v != NULL) { |
441 int image; |
441 int image = v->GetImage(DIR_W); |
442 |
|
443 switch (WP(w, depot_d).type) { |
|
444 case VEH_TRAIN: image = GetTrainImage(v, DIR_W); break; |
|
445 case VEH_ROAD: image = GetRoadVehImage(v, DIR_W); break; |
|
446 case VEH_SHIP: image = GetShipImage(v, DIR_W); break; |
|
447 case VEH_AIRCRAFT: image = GetAircraftImage(v, DIR_W); break; |
|
448 default: NOT_REACHED(); image = 0; |
|
449 } |
|
450 |
442 |
451 WP(w, depot_d).sel = v->index; |
443 WP(w, depot_d).sel = v->index; |
452 SetWindowDirty(w); |
444 SetWindowDirty(w); |
453 SetObjectToPlaceWnd(image, GetVehiclePalette(v), 4, w); |
445 SetObjectToPlaceWnd(image, GetVehiclePalette(v), 4, w); |
454 } |
446 } |