cpp/openttd-patchpack/source Changeset - r7862:5cb473c16799

Changeset - r7862:5cb473c16799

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 17 years ago 2007-11-11 18:22:06
rubidium@openttd.org

(svn r11412) -Fix (r11403): animation was not turned on properly.
-Fix (r11410): wrong assumption about random reseeds made the whole thing reseed way too often, making the animation look very ugly.

3 files changed with 7 insertions and 4 deletions:

src/industry_cmd.cpp

src/industry_map.h

src/newgrf_spritegroup.cpp

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -1437,8 +1437,9 @@ static void DoCreateNewIndustry(Industry @@
 	i->owner = owner;
 	r = Random();
 	i->random_color = GB(r, 8, 4);
 	i->counter = GB(r, 0, 12);
 	i->random_color = GB(r, 0, 4);
 	i->counter = GB(r, 4, 12);
 	i->random = GB(r, 16, 16);
 	i->produced_cargo_waiting[0] = 0;
 	i->produced_cargo_waiting[1] = 0;
 	i->incoming_cargo_waiting[0] = 0;
@@ @@ -1512,7 +1513,8 @@ static void DoCreateNewIndustry(Industry @@
 			if (_generating_world) {
 				SetIndustryConstructionCounter(cur_tile, 3);
 				SetIndustryConstructionStage(cur_tile, 2);
 			} else if (it->gfx >= NEW_INDUSTRYTILEOFFSET) {
+			}
 			if (it->gfx >= NEW_INDUSTRYTILEOFFSET) {
 				/* New industry */
 				const IndustryTileSpec *its = GetIndustryTileSpec(it->gfx);
 				if (its->animation_info != 0xFFFF) AddAnimatedTile(cur_tile);

src/industry_map.h

➞

Show inline comments

@@ @@ -169,6 +169,7 @@ static inline void MakeIndustry(TileInde @@
 	_m[t].m3 = 0;
 	_m[t].m4 = 0;
 	SetIndustryGfx(t, gfx);
 	_me[t].m7 = Random();
+}
 /**

src/newgrf_spritegroup.cpp

➞

Show inline comments

@@ @@ -252,7 +252,7 @@ static inline const SpriteGroup *Resolve @@
 		/* Handle triggers */
 		/* Magic code that may or may not do the right things... */
 		byte waiting_triggers = object->GetTriggers(object);
-		byte match = group->g.random.triggers & (waiting_triggers | object->trigger) || group->g.random.triggers == 0;
 		byte match = group->g.random.triggers & (waiting_triggers | object->trigger);
 		bool res;
 		res = (group->g.random.cmp_mode == RSG_CMP_ANY) ?

0 comments (0 inline, 0 general)