cpp/openttd-patchpack/source Changeset - r22708:8e8fa71eab82

Changeset - r22708:8e8fa71eab82

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 7 years ago 2017-10-25 15:38:19
frosch@openttd.org

(svn r27929) -Cleanup: Remove unused Industry::random_triggers

3 files changed with 2 insertions and 3 deletions:

src/industry.h

src/newgrf_industries.cpp

src/saveload/industry_sl.cpp

0 comments (0 inline, 0 general)

src/industry.h

➞

Show inline comments

@@ @@ -66,7 +66,6 @@ struct Industry : IndustryPool::PoolItem @@
 	Date last_cargo_accepted_at;        ///< Last day cargo was accepted by this industry
 	byte selected_layout;               ///< Which tile layout was used when creating the industry
 	byte random_triggers;               ///< Triggers for the random
 	uint16 random;                      ///< Random value used for randomisation of all kinds of things
 	PersistentStorage *psa;             ///< Persistent storage for NewGRF industries.

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -380,7 +380,7 @@ static uint32 GetCountAndDistanceOfClose @@
 /* virtual */ uint32 IndustriesScopeResolver::GetTriggers() const
+{
-	return this->industry != NULL ? this->industry->random_triggers : 0;
 	return 0;
+}
 /* virtual */ void IndustriesScopeResolver::StorePSA(uint pos, int32 value)

src/saveload/industry_sl.cpp

➞

Show inline comments

@@ @@ -57,7 +57,7 @@ static const SaveLoad _industry_desc[] = @@
 	SLEG_CONDARR(_old_ind_persistent_storage.storage, SLE_UINT32, 16,            76, 160),
 	SLE_CONDREF(Industry, psa,                        REF_STORAGE,              161, SL_MAX_VERSION),
-	SLE_CONDVAR(Industry, random_triggers,            SLE_UINT8,                 82, SL_MAX_VERSION),
+	SLE_CONDNULL(1, 82, 196), // random_triggers
 	SLE_CONDVAR(Industry, random,                     SLE_UINT16,                82, SL_MAX_VERSION),
 	SLE_CONDNULL(32, 2, 143), // old reserved space

0 comments (0 inline, 0 general)