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

(svn r23233) -Codechange: Refactor maximum and actually transported cargo amount of towns into a reusable struct.

Browse Source
This commit is contained in:
michi_cc
2011-11-15 20:47:53 +00:00
parent b6d3db762d
commit 56a592dcbd
9 changed files with 110 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/newgrf_town.cpp
View File

@@ -91,32 +91,32 @@ uint32 TownGetVariable(byte variable, uint32 parameter, bool *available, Town *t
case 0xB2: return t->statues;
case 0xB6: return ClampToU16(t->num_houses);
case 0xB9: return t->growth_rate;
case 0xBA: return ClampToU16(t->new_max_pass);
case 0xBB: return GB(ClampToU16(t->new_max_pass), 8, 8);
case 0xBC: return ClampToU16(t->new_max_mail);
case 0xBD: return GB(ClampToU16(t->new_max_mail), 8, 8);
case 0xBE: return ClampToU16(t->new_act_pass);
case 0xBF: return GB(ClampToU16(t->new_act_pass), 8, 8);
case 0xC0: return ClampToU16(t->new_act_mail);
case 0xC1: return GB(ClampToU16(t->new_act_mail), 8, 8);
case 0xC2: return ClampToU16(t->max_pass);
case 0xC3: return GB(ClampToU16(t->max_pass), 8, 8);
case 0xC4: return ClampToU16(t->max_mail);
case 0xC5: return GB(ClampToU16(t->max_mail), 8, 8);
case 0xC6: return ClampToU16(t->act_pass);
case 0xC7: return GB(ClampToU16(t->act_pass), 8, 8);
case 0xC8: return ClampToU16(t->act_mail);
case 0xC9: return GB(ClampToU16(t->act_mail), 8, 8);
case 0xBA: return ClampToU16(t->pass.new_max);
case 0xBB: return GB(ClampToU16(t->pass.new_max), 8, 8);
case 0xBC: return ClampToU16(t->mail.new_max);
case 0xBD: return GB(ClampToU16(t->mail.new_max), 8, 8);
case 0xBE: return ClampToU16(t->pass.new_act);
case 0xBF: return GB(ClampToU16(t->pass.new_act), 8, 8);
case 0xC0: return ClampToU16(t->mail.new_act);
case 0xC1: return GB(ClampToU16(t->mail.new_act), 8, 8);
case 0xC2: return ClampToU16(t->pass.old_max);
case 0xC3: return GB(ClampToU16(t->pass.old_max), 8, 8);
case 0xC4: return ClampToU16(t->mail.old_max);
case 0xC5: return GB(ClampToU16(t->mail.old_max), 8, 8);
case 0xC6: return ClampToU16(t->pass.old_act);
case 0xC7: return GB(ClampToU16(t->pass.old_act), 8, 8);
case 0xC8: return ClampToU16(t->mail.old_act);
case 0xC9: return GB(ClampToU16(t->mail.old_act), 8, 8);
case 0xCA: return t->GetPercentPassTransported();
case 0xCB: return t->GetPercentMailTransported();
case 0xCC: return t->new_act_food;
case 0xCD: return GB(t->new_act_food, 8, 8);
case 0xCE: return t->new_act_water;
case 0xCF: return GB(t->new_act_water, 8, 8);
case 0xD0: return t->act_food;
case 0xD1: return GB(t->act_food, 8, 8);
case 0xD2: return t->act_water;
case 0xD3: return GB(t->act_water, 8, 8);
case 0xCC: return t->food.new_act;
case 0xCD: return GB(t->food.new_act, 8, 8);
case 0xCE: return t->water.new_act;
case 0xCF: return GB(t->water.new_act, 8, 8);
case 0xD0: return t->food.old_act;
case 0xD1: return GB(t->food.old_act, 8, 8);
case 0xD2: return t->water.old_act;
case 0xD3: return GB(t->water.old_act, 8, 8);
case 0xD4: return t->road_build_months;
case 0xD5: return t->fund_buildings_months;
}