cpp/openttd-patchpack/source Changeset - r7666:15f3cb4b924a

Changeset - r7666:15f3cb4b924a

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

belugas - 17 years ago 2007-10-03 00:57:54
belugas@openttd.org

(svn r11197) -Fix: It is not useful to reset the override of an entity every time a new grf file is been submitted.
Since newhouses showed the way to newindustries(meaning I copied/adapted a lot of code and processes from it), the behaviour was there for newhouses too.

3 files changed with 7 insertions and 9 deletions:

src/industry_cmd.cpp

src/newgrf.cpp

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -71,6 +71,10 @@ void ResetIndustries() @@
 	memset(&_industry_tile_specs, 0, sizeof(_industry_tile_specs));
 	memcpy(&_industry_tile_specs, &_origin_industry_tile_specs, sizeof(_origin_industry_tile_specs));
 	/* Reset any overrides that have been set. */
 	_industile_mngr.ResetOverride();
 	_industry_mngr.ResetOverride();
+}
 void ResetIndustryCreationProbility(IndustryType type)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -1206,9 +1206,6 @@ static bool TownHouseChangeInfo(uint hid @@
 	/* Allocate house specs if they haven't been allocated already. */
 	if (_cur_grffile->housespec == NULL) {
 		_cur_grffile->housespec = CallocT<HouseSpec*>(HOUSE_MAX);
 		/* Reset any overrides that have been set. */
 		_house_mngr.ResetOverride();
+	}
 	for (int i = 0; i < numinfo; i++) {
@@ @@ -1715,9 +1712,6 @@ static bool IndustrytilesChangeInfo(uint @@
 	/* Allocate industry tile specs if they haven't been allocated already. */
 	if (_cur_grffile->indtspec == NULL) {
 		_cur_grffile->indtspec = CallocT<IndustryTileSpec*>(NUM_INDUSTRYTILES);
 		/* Reset any overrides that have been set. */
 		_industile_mngr.ResetOverride();
+	}
 	for (int i = 0; i < numinfo; i++) {
@@ @@ -1826,9 +1820,6 @@ static bool IndustriesChangeInfo(uint in @@
 	/* Allocate industry specs if they haven't been allocated already. */
 	if (_cur_grffile->industryspec == NULL) {
 		_cur_grffile->industryspec = CallocT<IndustrySpec*>(NUM_INDUSTRYTYPES);
 		/* Reset any overrides that have been set. */
 		_industry_mngr.ResetOverride();
+	}
 	for (int i = 0; i < numinfo; i++) {

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -2522,4 +2522,7 @@ void ResetHouses() @@
+{
 	memset(&_house_specs, 0, sizeof(_house_specs));
 	memcpy(&_house_specs, &_original_house_specs, sizeof(_original_house_specs));
 	/* Reset any overrides that have been set. */
 	_house_mngr.ResetOverride();
+}

0 comments (0 inline, 0 general)