Changeset - r22866:31c85ef6ecbd
[Not reviewed]
master
0 3 0
PeterN - 6 years ago 2018-05-19 21:31:46
peter@fuzzle.org
Change: Available railtypes is always calculated on load, so no need to load value for old savegames (#6782)
3 files changed with 3 insertions and 4 deletions:
0 comments (0 inline, 0 general)
src/company_base.h
Show inline comments
 
@@ -64,14 +64,12 @@ struct CompanyProperties {
 
	Money money;                     ///< Money owned by the company.
 
	byte money_fraction;             ///< Fraction of money of the company, too small to represent in #money.
 
	Money current_loan;              ///< Amount of money borrowed from the bank.
 

	
 
	byte colour;                     ///< Company colour.
 

	
 
	RailTypes avail_railtypes;       ///< Rail types available to the company.
 

	
 
	byte block_preview;              ///< Number of quarters that the company is not allowed to get new exclusive engine previews (see CompaniesGenStatistics).
 

	
 
	TileIndex location_of_HQ;        ///< Northern tile of HQ; #INVALID_TILE when there is none.
 
	TileIndex last_build_coordinate; ///< Coordinate of the last build thing by this company.
 

	
 
	OwnerByte share_owners[4];       ///< Owners of the 4 shares of the company. #INVALID_OWNER if nobody has bought them yet.
 
@@ -109,12 +107,13 @@ struct CompanyProperties {
 

	
 
struct Company : CompanyPool::PoolItem<&_company_pool>, CompanyProperties {
 
	Company(uint16 name_1 = 0, bool is_ai = false);
 
	~Company();
 

	
 
	Livery livery[LS_END];
 
	RailTypes avail_railtypes;         ///< Rail types available to this company.
 
	RoadTypes avail_roadtypes;         ///< Road types available to this company.
 

	
 
	class AIInstance *ai_instance;
 
	class AIInfo *ai_info;
 

	
 
	EngineRenewList engine_renew_list; ///< Engine renewals of this company.
src/saveload/company_sl.cpp
Show inline comments
 
@@ -256,13 +256,13 @@ static const SaveLoad _company_desc[] = 
 

	
 
	SLE_CONDVAR(CompanyProperties, current_loan,          SLE_VAR_I64 | SLE_FILE_I32,  0, 64),
 
	SLE_CONDVAR(CompanyProperties, current_loan,          SLE_INT64,                  65, SL_MAX_VERSION),
 

	
 
	    SLE_VAR(CompanyProperties, colour,                SLE_UINT8),
 
	    SLE_VAR(CompanyProperties, money_fraction,        SLE_UINT8),
 
	SLE_CONDVAR(CompanyProperties, avail_railtypes,       SLE_VAR_I32 | SLE_FILE_I8,   0, 57),
 
	SLE_CONDNULL(1,  0,  57), ///< avail_railtypes
 
	    SLE_VAR(CompanyProperties, block_preview,         SLE_UINT8),
 

	
 
	SLE_CONDNULL(2,  0,  93), ///< cargo_types
 
	SLE_CONDNULL(4, 94, 169), ///< cargo_types
 
	SLE_CONDVAR(CompanyProperties, location_of_HQ,        SLE_FILE_U16 | SLE_VAR_U32,  0,  5),
 
	SLE_CONDVAR(CompanyProperties, location_of_HQ,        SLE_UINT32,                  6, SL_MAX_VERSION),
src/saveload/oldloader_sl.cpp
Show inline comments
 
@@ -943,13 +943,13 @@ static const OldChunks _company_chunk[] 
 
	OCL_SVAR(                 OC_UINT8, Company, num_valid_stat_ent ),
 

	
 
	OCL_NULL( 230 ),         // Old AI
 

	
 
	OCL_SVAR(  OC_UINT8, Company, block_preview ),
 
	OCL_CNULL( OC_TTD, 1 ),           // Old AI
 
	OCL_SVAR( OC_TTD | OC_UINT8, Company, avail_railtypes ),
 
	OCL_CNULL( OC_TTD, 1 ), // avail_railtypes
 
	OCL_SVAR(   OC_TILE, Company, location_of_HQ ),
 
	OCL_SVAR( OC_TTD | OC_UINT8, Company, share_owners[0] ),
 
	OCL_SVAR( OC_TTD | OC_UINT8, Company, share_owners[1] ),
 
	OCL_SVAR( OC_TTD | OC_UINT8, Company, share_owners[2] ),
 
	OCL_SVAR( OC_TTD | OC_UINT8, Company, share_owners[3] ),
 

	
0 comments (0 inline, 0 general)