cpp/openttd-patchpack/source Changeset - r10176:4ba2bf13463a

Changeset - r10176:4ba2bf13463a

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 16 years ago 2008-09-21 18:28:35
rubidium@openttd.org

(svn r14371) -Fix [FS#2313]: loading indicator didn't stay with the front engine when turning a train in a station.

4 files changed with 9 insertions and 7 deletions:

src/misc_gui.cpp

src/texteff.hpp

src/train_cmd.cpp

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -607,9 +607,12 @@ void UpdateFillingPercent(TextEffectID t @@
 	UpdateTextEffect(te_id, string);
+}
 void HideFillingPercent(TextEffectID te_id)
+void HideFillingPercent(TextEffectID *te_id)
+{
 	if (te_id != INVALID_TE_ID) RemoveTextEffect(te_id);
 	if (*te_id == INVALID_TE_ID) return;
 	RemoveTextEffect(*te_id);
 	*te_id = INVALID_TE_ID;
+}
 static const Widget _tooltips_widgets[] = {

src/texteff.hpp

➞

Show inline comments

@@ @@ -29,6 +29,6 @@ void RemoveTextEffect(TextEffectID effec @@
 /* misc_gui.cpp */
 TextEffectID ShowFillingPercent(int x, int y, int z, uint8 percent, StringID color);
 void UpdateFillingPercent(TextEffectID te_id, uint8 percent, StringID color);
 void HideFillingPercent(TextEffectID te_id);
+void HideFillingPercent(TextEffectID *te_id);
 #endif /* TEXTEFF_HPP */

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -1957,6 +1957,7 @@ CommandCost CmdReverseTrainDirection(Til @@
 			} else {
 				v->cur_speed = 0;
 				SetLastSpeed(v, 0);
 				HideFillingPercent(&v->fill_percent_te_id);
 				ReverseTrainDirection(v);
+			}
+		}

src/vehicle.cpp

➞

Show inline comments

@@ @@ -643,8 +643,7 @@ void Vehicle::PreDestructor() @@
 	if (IsValidStationID(this->last_station_visited)) {
 		GetStation(this->last_station_visited)->loading_vehicles.remove(this);
 		HideFillingPercent(this->fill_percent_te_id);
 		this->fill_percent_te_id = INVALID_TE_ID;
 		HideFillingPercent(&this->fill_percent_te_id);
+	}
 	if (IsEngineCountable(this)) {
@@ @@ -2533,8 +2532,7 @@ void Vehicle::LeaveStation() @@
 	Station *st = GetStation(this->last_station_visited);
 	st->loading_vehicles.remove(this);
 	HideFillingPercent(this->fill_percent_te_id);
 	this->fill_percent_te_id = INVALID_TE_ID;
 	HideFillingPercent(&this->fill_percent_te_id);
 	if (this->type == VEH_TRAIN) {
 		/* Trigger station animation (trains only) */

0 comments (0 inline, 0 general)