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

TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes

Browse Source 
Slight code, GUI layout, and savegame format tidying
This commit is contained in:
Jonathan G Rennison
2018-05-13 15:00:26 +01:00
parent 4a9df57665
commit 5877cd0f9b
14 changed files with 116 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tbtr_template_vehicle_func.cpp
View File

@@ -131,9 +131,9 @@ void DrawTemplate(const TemplateVehicle *tv, int left, int right, int y)
while (t) {
PaletteID pal = GetEnginePalette(t->engine_type, _current_company);
t->sprite_seq.Draw(offset + t->image_width / 2, ScaleGUITrad(11), pal, false);
t->sprite_seq.Draw(offset + t->image_dimensions.GetOffsetX(), t->image_dimensions.GetOffsetY() + ScaleGUITrad(11), pal, false);
offset += t->image_width;
offset += t->image_dimensions.GetDisplayImageWidth();
t = t->Next();
}
@@ -165,10 +165,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);
Point *p = new Point();
tmp->image_width = virt->GetDisplayImageWidth(p);
virt->GetImage(DIR_W, EIT_IN_DEPOT, &tmp->sprite_seq);
tmp->image_dimensions.SetFromTrain(virt);
}
// create a full TemplateVehicle based train according to a virtual train
@@ -293,7 +291,7 @@ void NeutralizeStatus(Train *t)
DoCommand(0, t->index, 0, DC_EXEC, CMD_RENAME_VEHICLE, NULL);
}
bool TrainMatchesTemplate(const Train *t, TemplateVehicle *tv) {
bool TrainMatchesTemplate(const Train *t, const TemplateVehicle *tv) {
while (t && tv) {
if (t->engine_type != tv->engine_type) {
return false;
@@ -308,7 +306,7 @@ bool TrainMatchesTemplate(const Train *t, TemplateVehicle *tv) {
}
bool TrainMatchesTemplateRefit(const Train *t, TemplateVehicle *tv)
bool TrainMatchesTemplateRefit(const Train *t, const TemplateVehicle *tv)
{
if (!tv->refit_as_template) {
return true;
@@ -346,7 +344,7 @@ void CopyWagonStatus(TemplateVehicle *from, Train *to)
to->cargo_subtype = from->cargo_subtype;
}
int NumTrainsNeedTemplateReplacement(GroupID g_id, TemplateVehicle *tv)
int NumTrainsNeedTemplateReplacement(GroupID g_id, const TemplateVehicle *tv)
{
int count = 0;
if (!tv) return count;