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

Merge branch 'house_placing' into jgrpp

Browse Source 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-04-08 20:15:08 +01:00
parent 0d26da998b 6ebea4b49c
commit 41a06e698f
32 changed files with 1401 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/newgrf.cpp
View File

@@ -2353,6 +2353,7 @@ static ChangeInfoResult TownHouseChangeInfo(uint hid, int numinfo, int prop, Byt
housespec->grf_prop.local_id = hid + i;
housespec->grf_prop.subst_id = subs_id;
housespec->grf_prop.grffile = _cur.grffile;
housespec->construction_cost = 0xFFFF;
housespec->random_colour[0] = 0x04; // those 4 random colours are the base colour
housespec->random_colour[1] = 0x08; // for all new houses
housespec->random_colour[2] = 0x0C; // they stand for red, blue, orange and green
@@ -2519,6 +2520,14 @@ static ChangeInfoResult TownHouseChangeInfo(uint hid, int numinfo, int prop, Byt
housespec->max_year = buf->ReadWord();
break;
case 0x23: // Build cost multiplier
housespec->construction_cost = buf->ReadDWord();
break;
case 0x24:
housespec->num_variants = buf->ReadByte();
break;
default:
ret = CIR_UNKNOWN;
break;
@@ -8594,6 +8603,13 @@ static void FinaliseHouseArray()
* building_flags to zero here to make sure any house following
* this one in the pool is properly handled as 1x1 house. */
hs->building_flags = TILE_NO_FLAG;
} else if (hs->enabled && (hs->building_flags && BUILDING_HAS_1_TILE)) {
if (hs->construction_cost == 0xFFFF) {
hs->construction_cost = DefaultHouseCostBaseMultiplier(
hs->callback_mask, hs->population, hs->mail_generation,
hs->cargo_acceptance[0], hs->cargo_acceptance[1], hs->cargo_acceptance[2],
hs->accepts_cargo[0], hs->accepts_cargo[1], hs->accepts_cargo[2]);
}
}
}