dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'template_train_replacement' into jgrpp

Browse Source 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
This commit is contained in:
Jonathan G Rennison
2018-05-13 15:01:29 +01:00
parent 6342099c4d 5877cd0f9b
commit a60eff174d
14 changed files with 116 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vehicle_cmd.cpp
View File

@@ -860,9 +860,8 @@ inline void SetupTemplateVehicleFromVirtual(TemplateVehicle *tmp, TemplateVehicl
tmp->weight = gcache->cached_weight;
tmp->max_te = gcache->cached_max_te / 1000;
tmp->spritenum = virt->spritenum;
virt->GetImage(DIR_W, EIT_PURCHASE, &tmp->sprite_seq);
tmp->image_width = virt->GetDisplayImageWidth();
virt->GetImage(DIR_W, EIT_IN_DEPOT, &tmp->sprite_seq);
tmp->image_dimensions.SetFromTrain(virt);
}
/**