cpp/openttd-patchpack/source Changeset - r17997:5866700f3901

Changeset - r17997:5866700f3901

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 13 years ago 2011-08-22 21:33:58
frosch@openttd.org

(svn r22816) -Feature(ette): [NewGRF] Also age wagons and articulated parts.

3 files changed with 6 insertions and 5 deletions:

src/roadveh_cmd.cpp

src/train_cmd.cpp

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/roadveh_cmd.cpp

➞

Show inline comments

@@ @@ -1591,12 +1591,13 @@ static void CheckIfRoadVehNeedsService(R @@
 void RoadVehicle::OnNewDay()
+{
 	AgeVehicle(this);
 	if (!this->IsFrontEngine()) return;
 	if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
 	if (this->blocked_ctr == 0) CheckVehicleBreakdown(this);
 	AgeVehicle(this);
 	CheckIfRoadVehNeedsService(this);
 	CheckOrders(this);

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -3778,11 +3778,12 @@ static void CheckIfTrainNeedsService(Tra @@
 void Train::OnNewDay()
+{
 	AgeVehicle(this);
 	if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
 	if (this->IsFrontEngine()) {
 		CheckVehicleBreakdown(this);
 		AgeVehicle(this);
 		CheckIfTrainNeedsService(this);
@@ @@ -3806,9 +3807,6 @@ void Train::OnNewDay() @@
 			SetWindowDirty(WC_VEHICLE_DETAILS, this->index);
 			SetWindowClassesDirty(WC_TRAINS_LIST);
+		}
 	} else if (this->IsEngine()) {
 		/* Also age engines that aren't front engines */
 		AgeVehicle(this);
+	}
+}

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1138,6 +1138,8 @@ void AgeVehicle(Vehicle *v) @@
+{
 	if (v->age < MAX_DAY) v->age++;
 	if (!v->IsPrimaryVehicle() && (v->type != VEH_TRAIN || !Train::From(v)->IsEngine())) return;
 	int age = v->age - v->max_age;
 	if (age == DAYS_IN_LEAP_YEAR * 0 || age == DAYS_IN_LEAP_YEAR * 1 ||
 			age == DAYS_IN_LEAP_YEAR * 2 || age == DAYS_IN_LEAP_YEAR * 3 || age == DAYS_IN_LEAP_YEAR * 4) {

0 comments (0 inline, 0 general)