diff -r dce9a6923bb7 -r 0b2aebc8283e src/newgrf.cpp --- a/src/newgrf.cpp Wed Jun 13 11:00:24 2007 +0000 +++ b/src/newgrf.cpp Wed Jun 13 11:17:30 2007 +0000 @@ -1372,7 +1372,7 @@ case 0x17: // Four random colours to use FOR_EACH_OBJECT { uint j; - for (j = 0; j < 4; j++) housespec[i]->random_colour[j] = grf_load_byte(&buf); + for (j = 0; j < 4; j++) housespec[i]->random_colour[j] = grf_load_byte(&buf); } break; @@ -1523,7 +1523,7 @@ uint32 tempfix = grf_load_dword(&buf); if (curidx < NUM_CURRENCY) { - memcpy(&_currency_specs[curidx].suffix,&tempfix,4); + memcpy(&_currency_specs[curidx].suffix, &tempfix, 4); _currency_specs[curidx].suffix[4] = 0; } else { grfmsg(1, "GlobalVarChangeInfo: Currency symbol %d out of range, ignoring", curidx); @@ -2796,7 +2796,7 @@ case GSF_CANAL : case GSF_BRIDGE : AddGRFString(_cur_spriteid, id, lang, name); - switch (GB(id, 8,8)) { + switch (GB(id, 8, 8)) { case 0xC9: // House name default: grfmsg(7, "FeatureNewName: Unsupported ID (0x%04X)", id); @@ -4104,16 +4104,17 @@ | (0 << 0x0B) // enhancedgui | (0 << 0x0C) // newagerating | ((_patches.build_on_slopes ? 1 : 0) << 0x0D) // buildonslopes + | ((_patches.full_load_any ? 1 : 0) << 0x0E) // fullloadany | (0 << 0x0F) // planespeed | (0 << 0x10) // moreindustriesperclimate - obsolete | (0 << 0x11) // moretoylandfeatures | (1 << 0x12) // newstations | (0 << 0x13) // tracktypecostdiff - | (0 << 0x14) // manualconvert + | (1 << 0x14) // manualconvert | ((_patches.build_on_slopes ? 1 : 0) << 0x15) // buildoncoasts | (1 << 0x16) // canals | (1 << 0x17) // newstartyear - | (0 << 0x18) // freighttrains + | ((_patches.freight_trains > 1 ? 1 : 0) << 0x18) // freighttrains | (1 << 0x19) // newhouses | (1 << 0x1A) // newbridges | (0 << 0x1B) // newtownnames @@ -4145,7 +4146,8 @@ | (0 << 0x14) // trams | (0 << 0x15) // enhancetunnels | (0 << 0x16) // shortrvs - | (0 << 0x17); // articulatedrvs + | (0 << 0x17) // articulatedrvs + | (1 << 0x1E); // variablerunningcosts } static void ResetCustomStations()