diff options
| author | michi_cc <michi_cc@openttd.org> | 2011-11-15 20:47:53 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2011-11-15 20:47:53 +0000 |
| commit | 6548ec6e9ecf0f6d608d0b738213f62b1ce6e584 (patch) | |
| tree | d8e94705bf49526712eda2cc81588d9b5fac8ee3 /src/newgrf_town.cpp | |
| parent | 88aaeb4092e563f9e894608fc27d507d4693f188 (diff) | |
| download | openttd-6548ec6e9ecf0f6d608d0b738213f62b1ce6e584.tar.xz | |
(svn r23233) -Codechange: Refactor maximum and actually transported cargo amount of towns into a reusable struct.
Diffstat (limited to 'src/newgrf_town.cpp')
| -rw-r--r-- | src/newgrf_town.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/newgrf_town.cpp b/src/newgrf_town.cpp index 3ef42e492..b144897ec 100644 --- a/src/newgrf_town.cpp +++ b/src/newgrf_town.cpp @@ -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; } |