Files
@ r17167:68f47a8db1b5
Branch filter:
Location: cpp/openttd-patchpack/source/src/newgrf_town.cpp - annotation
r17167:68f47a8db1b5
4.6 KiB
text/x-c
(svn r21916) -Fix [FS#4442]: the minimum speed needed for (realistic) acceleration to work properly can sometimes be more than the (temporary) maximum speed causing Clamp to "fail". Make sure that the minimum speed always overrules the maximum speed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | r6332:7393965b5322 r6332:7393965b5322 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r15610:623a23fb6560 r15610:623a23fb6560 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r15613:193c12018337 r15613:193c12018337 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6520:d4048ad124f5 r9413:fcf267325763 r6522:78d7ef152245 r6520:d4048ad124f5 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r8610:c23086b09c25 r8610:c23086b09c25 r6332:7393965b5322 r12208:4a6d754234c5 r6332:7393965b5322 r8943:ea9f1975940f r8943:ea9f1975940f r8943:ea9f1975940f r8943:ea9f1975940f r8943:ea9f1975940f r8943:ea9f1975940f r8943:ea9f1975940f r8943:ea9f1975940f r8943:ea9f1975940f r8943:ea9f1975940f r6332:7393965b5322 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r8635:4d4aa72638e1 r6332:7393965b5322 r6332:7393965b5322 r8707:7817a5018c47 r6332:7393965b5322 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r8610:c23086b09c25 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r6332:7393965b5322 r16464:ae3f342df07b r6332:7393965b5322 r6332:7393965b5322 r11163:407814b6138f r6332:7393965b5322 | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file newgrf_town.cpp Implementation of the town part of NewGRF houses. */
#include "stdafx.h"
#include "debug.h"
#include "town.h"
/**
* This function implements the town variables that newGRF defines.
* @param variable that is queried
* @param parameter unused
* @param available will return false if ever the variable asked for does not exist
* @param t is of course the town we are inquiring
* @return the value stored in the corresponding variable
*/
uint32 TownGetVariable(byte variable, byte parameter, bool *available, const Town *t)
{
switch (variable) {
/* Larger towns */
case 0x40:
if (_settings_game.economy.larger_towns == 0) return 2;
if (t->larger_town) return 1;
return 0;
/* Town index */
case 0x41: return t->index;
/* Town properties */
case 0x80: return t->xy;
case 0x81: return GB(t->xy, 8, 8);
case 0x82: return ClampToU16(t->population);
case 0x83: return GB(ClampToU16(t->population), 8, 8);
case 0x8A: return t->grow_counter;
case 0x92: return t->flags; // In original game, 0x92 and 0x93 are really one word. Since flags is a byte, this is to adjust
case 0x93: return 0;
case 0x94: return ClampToU16(t->squared_town_zone_radius[0]);
case 0x95: return GB(ClampToU16(t->squared_town_zone_radius[0]), 8, 8);
case 0x96: return ClampToU16(t->squared_town_zone_radius[1]);
case 0x97: return GB(ClampToU16(t->squared_town_zone_radius[1]), 8, 8);
case 0x98: return ClampToU16(t->squared_town_zone_radius[2]);
case 0x99: return GB(ClampToU16(t->squared_town_zone_radius[2]), 8, 8);
case 0x9A: return ClampToU16(t->squared_town_zone_radius[3]);
case 0x9B: return GB(ClampToU16(t->squared_town_zone_radius[3]), 8, 8);
case 0x9C: return ClampToU16(t->squared_town_zone_radius[4]);
case 0x9D: return GB(ClampToU16(t->squared_town_zone_radius[4]), 8, 8);
case 0x9E: return t->ratings[0];
case 0x9F: return GB(t->ratings[0], 8, 8);
case 0xA0: return t->ratings[1];
case 0xA1: return GB(t->ratings[1], 8, 8);
case 0xA2: return t->ratings[2];
case 0xA3: return GB(t->ratings[2], 8, 8);
case 0xA4: return t->ratings[3];
case 0xA5: return GB(t->ratings[3], 8, 8);
case 0xA6: return t->ratings[4];
case 0xA7: return GB(t->ratings[4], 8, 8);
case 0xA8: return t->ratings[5];
case 0xA9: return GB(t->ratings[5], 8, 8);
case 0xAA: return t->ratings[6];
case 0xAB: return GB(t->ratings[6], 8, 8);
case 0xAC: return t->ratings[7];
case 0xAD: return GB(t->ratings[7], 8, 8);
case 0xAE: return t->have_ratings;
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 0xCA: return t->pct_pass_transported;
case 0xCB: return t->pct_mail_transported;
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 0xD4: return t->road_build_months;
case 0xD5: return t->fund_buildings_months;
}
DEBUG(grf, 1, "Unhandled town variable 0x%X", variable);
*available = false;
return UINT_MAX;
}
|