cpp/openttd-patchpack/source Changeset - r10491:e3e4bb1ebaea

Changeset - r10491:e3e4bb1ebaea

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

smatz - 15 years ago 2008-12-26 19:37:50
smatz@openttd.org

(svn r14746) -Fix: don't let any disaster vehicle (Helicopter or Airplane) target invalid industry

3 files changed with 21 insertions and 0 deletions:

src/disaster_cmd.cpp

src/industry.h

src/industry_cmd.cpp

0 comments (0 inline, 0 general)

src/disaster_cmd.cpp

➞

Show inline comments

@@ @@ -1054,20 +1054,36 @@ void DisasterDailyLoop() @@
 	if (--_disaster_delay != 0) return;
 	ResetDisasterDelay();
 	if (_settings_game.difficulty.disasters != 0) DoDisaster();
+}
 void StartupDisasters()
+{
 	ResetDisasterDelay();
+}
 /** Marks all disasters targeting this industry in such a way
  * they won't call GetIndustry(v->dest_tile) on invalid industry anymore.
  * @param i deleted industry
  */
 void ReleaseDisastersTargetingIndustry(IndustryID i)
+{
 	Vehicle *v;
 	FOR_ALL_VEHICLES(v) {
 		/* primary disaster vehicles that have chosen target */
 		if (v->type == VEH_DISASTER && (v->subtype == ST_Airplane || v->subtype == ST_Helicopter)) {
 			/* if it has chosen target, and it is this industry (yes, dest_tile is IndustryID here), set order to "leaving map peacefully" */
 			if (v->current_order.GetDestination() > 0 && v->dest_tile == i) v->current_order.SetDestination(3);
+		}
+	}
+}
 void DisasterVehicle::UpdateDeltaXY(Direction direction)
+{
 	this->x_offs        = -1;
 	this->y_offs        = -1;
 	this->x_extent      =  2;
 	this->y_extent      =  2;
 	this->z_extent      =  5;
+}

src/industry.h

➞

Show inline comments

@@ @@ -229,24 +229,26 @@ struct IndustryTileSpec { @@
 	uint8 animation_triggers;             ///< When to start the animation
 	uint8 animation_special_flags;        ///< Extra flags to influence the animation
 	bool enabled;                         ///< entity still avaible (by default true).newgrf can disable it, though
 	struct GRFFileProps grf_prop;
 };
 /* industry_cmd.cpp*/
 const IndustrySpec *GetIndustrySpec(IndustryType thistype);    ///< Array of industries data
 const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx);  ///< Array of industry tiles data
 void ResetIndustries();
 void PlantRandomFarmField(const Industry *i);
 void ReleaseDisastersTargetingIndustry(IndustryID);
 /* writable arrays of specs */
 extern IndustrySpec _industry_specs[NUM_INDUSTRYTYPES];
 extern IndustryTileSpec _industry_tile_specs[NUM_INDUSTRYTILES];
 static inline IndustryGfx GetTranslatedIndustryTileID(IndustryGfx gfx)
+{
 	/* the 0xFF should be GFX_WATERTILE_SPECIALCHECK but for reasons of include mess,
 	 * we'll simplify the writing.
 	 * Basically, the first test is required since the GFX_WATERTILE_SPECIALCHECK value
 	 * will never be assigned as a tile index and is only required in order to do some
 	 * tests while building the industry (as in WATER REQUIRED */
 	if (gfx != 0xFF) {

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -157,24 +157,27 @@ Industry::~Industry() @@
 	if (GetIndustrySpec(this->type)->behaviour & INDUSTRYBEH_PLANT_FIELDS) {
 		/* Remove the farmland and convert it to regular tiles over time. */
 		BEGIN_TILE_LOOP(tile_cur, 42, 42, this->xy - TileDiffXY(21, 21)) {
 			tile_cur = TILE_MASK(tile_cur);
 			if (IsTileType(tile_cur, MP_CLEAR) && IsClearGround(tile_cur, CLEAR_FIELDS) &&
 					GetIndustryIndexOfField(tile_cur) == this->index) {
 				SetIndustryIndexOfField(tile_cur, INVALID_INDUSTRY);
+			}
 		} END_TILE_LOOP(tile_cur, 42, 42, this->xy - TileDiff(21, 21))
+	}
 	/* don't let any disaster vehicle target invalid industry */
 	ReleaseDisastersTargetingIndustry(this->index);
 	DecIndustryTypeCount(this->type);
 	DeleteSubsidyWithIndustry(this->index);
 	DeleteWindowById(WC_INDUSTRY_VIEW, this->index);
 	InvalidateWindowData(WC_INDUSTRY_DIRECTORY, 0, 0);
 	this->xy = 0;
+}
 static void IndustryDrawSugarMine(const TileInfo *ti)
+{
 	const DrawIndustryAnimationStruct *d;

0 comments (0 inline, 0 general)