src/newgrf.cpp
branchgamebalance
changeset 9910 0b2aebc8283e
parent 9909 dce9a6923bb7
child 9911 0b8b245a2391
equal deleted inserted replaced
9909:dce9a6923bb7 9910:0b2aebc8283e
  1370 			break;
  1370 			break;
  1371 
  1371 
  1372 		case 0x17: // Four random colours to use
  1372 		case 0x17: // Four random colours to use
  1373 			FOR_EACH_OBJECT {
  1373 			FOR_EACH_OBJECT {
  1374 				uint j;
  1374 				uint j;
  1375 				for (j = 0; j < 4; j++)	housespec[i]->random_colour[j] = grf_load_byte(&buf);
  1375 				for (j = 0; j < 4; j++) housespec[i]->random_colour[j] = grf_load_byte(&buf);
  1376 			}
  1376 			}
  1377 			break;
  1377 			break;
  1378 
  1378 
  1379 		case 0x18: // Relative probability of appearing
  1379 		case 0x18: // Relative probability of appearing
  1380 			FOR_EACH_OBJECT housespec[i]->probability = grf_load_byte(&buf);
  1380 			FOR_EACH_OBJECT housespec[i]->probability = grf_load_byte(&buf);
  1521 			FOR_EACH_OBJECT {
  1521 			FOR_EACH_OBJECT {
  1522 				uint curidx = GetNewgrfCurrencyIdConverted(gvid + i);
  1522 				uint curidx = GetNewgrfCurrencyIdConverted(gvid + i);
  1523 				uint32 tempfix = grf_load_dword(&buf);
  1523 				uint32 tempfix = grf_load_dword(&buf);
  1524 
  1524 
  1525 				if (curidx < NUM_CURRENCY) {
  1525 				if (curidx < NUM_CURRENCY) {
  1526 					memcpy(&_currency_specs[curidx].suffix,&tempfix,4);
  1526 					memcpy(&_currency_specs[curidx].suffix, &tempfix, 4);
  1527 					_currency_specs[curidx].suffix[4] = 0;
  1527 					_currency_specs[curidx].suffix[4] = 0;
  1528 				} else {
  1528 				} else {
  1529 					grfmsg(1, "GlobalVarChangeInfo: Currency symbol %d out of range, ignoring", curidx);
  1529 					grfmsg(1, "GlobalVarChangeInfo: Currency symbol %d out of range, ignoring", curidx);
  1530 				}
  1530 				}
  1531 			}
  1531 			}
  2794 
  2794 
  2795 #if 0
  2795 #if 0
  2796 				case GSF_CANAL :
  2796 				case GSF_CANAL :
  2797 				case GSF_BRIDGE :
  2797 				case GSF_BRIDGE :
  2798 					AddGRFString(_cur_spriteid, id, lang, name);
  2798 					AddGRFString(_cur_spriteid, id, lang, name);
  2799 					switch (GB(id, 8,8)) {
  2799 					switch (GB(id, 8, 8)) {
  2800 						case 0xC9: // House name
  2800 						case 0xC9: // House name
  2801 						default:
  2801 						default:
  2802 							grfmsg(7, "FeatureNewName: Unsupported ID (0x%04X)", id);
  2802 							grfmsg(7, "FeatureNewName: Unsupported ID (0x%04X)", id);
  2803 					}
  2803 					}
  2804 					break;
  2804 					break;
  4102 	_ttdpatch_flags[2] =                                        (1 << 0x01)  // loadallgraphics - obsolote
  4102 	_ttdpatch_flags[2] =                                        (1 << 0x01)  // loadallgraphics - obsolote
  4103 	                   |                                        (1 << 0x03)  // semaphores
  4103 	                   |                                        (1 << 0x03)  // semaphores
  4104 	                   |                                        (0 << 0x0B)  // enhancedgui
  4104 	                   |                                        (0 << 0x0B)  // enhancedgui
  4105 	                   |                                        (0 << 0x0C)  // newagerating
  4105 	                   |                                        (0 << 0x0C)  // newagerating
  4106 	                   |       ((_patches.build_on_slopes ? 1 : 0) << 0x0D)  // buildonslopes
  4106 	                   |       ((_patches.build_on_slopes ? 1 : 0) << 0x0D)  // buildonslopes
       
  4107 	                   |         ((_patches.full_load_any ? 1 : 0) << 0x0E)  // fullloadany
  4107 	                   |                                        (0 << 0x0F)  // planespeed
  4108 	                   |                                        (0 << 0x0F)  // planespeed
  4108 	                   |                                        (0 << 0x10)  // moreindustriesperclimate - obsolete
  4109 	                   |                                        (0 << 0x10)  // moreindustriesperclimate - obsolete
  4109 	                   |                                        (0 << 0x11)  // moretoylandfeatures
  4110 	                   |                                        (0 << 0x11)  // moretoylandfeatures
  4110 	                   |                                        (1 << 0x12)  // newstations
  4111 	                   |                                        (1 << 0x12)  // newstations
  4111 	                   |                                        (0 << 0x13)  // tracktypecostdiff
  4112 	                   |                                        (0 << 0x13)  // tracktypecostdiff
  4112 	                   |                                        (0 << 0x14)  // manualconvert
  4113 	                   |                                        (1 << 0x14)  // manualconvert
  4113 	                   |       ((_patches.build_on_slopes ? 1 : 0) << 0x15)  // buildoncoasts
  4114 	                   |       ((_patches.build_on_slopes ? 1 : 0) << 0x15)  // buildoncoasts
  4114 	                   |                                        (1 << 0x16)  // canals
  4115 	                   |                                        (1 << 0x16)  // canals
  4115 	                   |                                        (1 << 0x17)  // newstartyear
  4116 	                   |                                        (1 << 0x17)  // newstartyear
  4116 	                   |                                        (0 << 0x18)  // freighttrains
  4117 	                   |    ((_patches.freight_trains > 1 ? 1 : 0) << 0x18)  // freighttrains
  4117 	                   |                                        (1 << 0x19)  // newhouses
  4118 	                   |                                        (1 << 0x19)  // newhouses
  4118 	                   |                                        (1 << 0x1A)  // newbridges
  4119 	                   |                                        (1 << 0x1A)  // newbridges
  4119 	                   |                                        (0 << 0x1B)  // newtownnames
  4120 	                   |                                        (0 << 0x1B)  // newtownnames
  4120 	                   |                                        (0 << 0x1C)  // moreanimations
  4121 	                   |                                        (0 << 0x1C)  // moreanimations
  4121 	                   |    ((_patches.wagon_speed_limits ? 1 : 0) << 0x1D)  // wagonspeedlimits
  4122 	                   |    ((_patches.wagon_speed_limits ? 1 : 0) << 0x1D)  // wagonspeedlimits
  4143 	                   |                                        (1 << 0x12)  // autoslope
  4144 	                   |                                        (1 << 0x12)  // autoslope
  4144 	                   |                                        (0 << 0x13)  // followvehicle
  4145 	                   |                                        (0 << 0x13)  // followvehicle
  4145 	                   |                                        (0 << 0x14)  // trams
  4146 	                   |                                        (0 << 0x14)  // trams
  4146 	                   |                                        (0 << 0x15)  // enhancetunnels
  4147 	                   |                                        (0 << 0x15)  // enhancetunnels
  4147 	                   |                                        (0 << 0x16)  // shortrvs
  4148 	                   |                                        (0 << 0x16)  // shortrvs
  4148 	                   |                                        (0 << 0x17); // articulatedrvs
  4149 	                   |                                        (0 << 0x17)  // articulatedrvs
       
  4150 	                   |                                        (1 << 0x1E); // variablerunningcosts
  4149 }
  4151 }
  4150 
  4152 
  4151 static void ResetCustomStations()
  4153 static void ResetCustomStations()
  4152 {
  4154 {
  4153 	for (GRFFile *file = _first_grffile; file != NULL; file = file->next) {
  4155 	for (GRFFile *file = _first_grffile; file != NULL; file = file->next) {