dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some more whitespace/formatting issues.

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-01-31 15:22:46 +00:00
parent 5e924262f4
commit 9742300a1e
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ground_vehicle.cpp
View File

@@ -171,8 +171,7 @@ int GroundVehicle<T, Type>::GetAcceleration()
AccelStatus mode = v->GetAccelerationStatus(); AccelStatus mode = v->GetAccelerationStatus();
/* handle breakdown power reduction */ /* handle breakdown power reduction */
//TODO if (Type == VEH_TRAIN && mode == AS_ACCEL && HasBit(Train::From(this)->flags, VRF_BREAKDOWN_POWER)) {
if( Type == VEH_TRAIN && mode == AS_ACCEL && HasBit(Train::From(this)->flags, VRF_BREAKDOWN_POWER)) {
/* We'd like to cache this, but changing cached_power has too many unwanted side-effects */ /* We'd like to cache this, but changing cached_power has too many unwanted side-effects */
uint32 power_temp; uint32 power_temp;
this->CalculatePower(power_temp, max_te, true); this->CalculatePower(power_temp, max_te, true);
@@ -198,7 +197,7 @@ int GroundVehicle<T, Type>::GetAcceleration()
} }
/* If power is 0 because of a breakdown, we make the force 0 if accelerating */ /* If power is 0 because of a breakdown, we make the force 0 if accelerating */
if ( Type == VEH_TRAIN && mode == AS_ACCEL && HasBit(Train::From(this)->flags, VRF_BREAKDOWN_POWER) && power == 0) { if (Type == VEH_TRAIN && mode == AS_ACCEL && HasBit(Train::From(this)->flags, VRF_BREAKDOWN_POWER) && power == 0) {
force = 0; force = 0;
} }
@@ -214,7 +213,7 @@ int GroundVehicle<T, Type>::GetAcceleration()
uint64 breakdown_factor = (uint64)abs(resistance) * (uint64)(this->cur_speed << 16); uint64 breakdown_factor = (uint64)abs(resistance) * (uint64)(this->cur_speed << 16);
breakdown_factor /= (max(force, (int64)100) * this->gcache.cached_max_track_speed); breakdown_factor /= (max(force, (int64)100) * this->gcache.cached_max_track_speed);
breakdown_factor = min((64 << 16) + (breakdown_factor * 128), 255 << 16); breakdown_factor = min((64 << 16) + (breakdown_factor * 128), 255 << 16);
if ( Type == VEH_TRAIN && Train::From(this)->tcache.cached_num_engines > 1) { if (Type == VEH_TRAIN && Train::From(this)->tcache.cached_num_engines > 1) {
/* For multiengine trains, breakdown chance is multiplied by 3 / (num_engines + 2) */ /* For multiengine trains, breakdown chance is multiplied by 3 / (num_engines + 2) */
breakdown_factor *= 3; breakdown_factor *= 3;
breakdown_factor /= (Train::From(this)->tcache.cached_num_engines + 2); breakdown_factor /= (Train::From(this)->tcache.cached_num_engines + 2);
@@ -246,8 +245,7 @@ int GroundVehicle<T, Type>::GetAcceleration()
accel -= this->acceleration >> 1; accel -= this->acceleration >> 1;
} }
if (this->IsFrontEngine() && !(this->current_order_time & 0x1FF) &&
if ( this->IsFrontEngine() && !(this->current_order_time & 0x1FF) &&
!(this->current_order.IsType(OT_LOADING)) && !(this->current_order.IsType(OT_LOADING)) &&
!(Train::From(this)->flags & (VRF_IS_BROKEN | (1 << VRF_TRAIN_STUCK))) && !(Train::From(this)->flags & (VRF_IS_BROKEN | (1 << VRF_TRAIN_STUCK))) &&
this->cur_speed < 3 && accel < 5) { this->cur_speed < 3 && accel < 5) {

7
src/ground_vehicle.hpp
View File

@@ -376,17 +376,18 @@ protected:
if (this->breakdown_ctr == 1) { if (this->breakdown_ctr == 1) {
if (this->breakdown_type == BREAKDOWN_LOW_POWER) { if (this->breakdown_type == BREAKDOWN_LOW_POWER) {
if((this->tick_counter & 0x7) == 0) { if ((this->tick_counter & 0x7) == 0) {
if(this->cur_speed > (this->breakdown_severity * max_speed) >> 8) { if (this->cur_speed > (this->breakdown_severity * max_speed) >> 8) {
tempmax = this->cur_speed - (this->cur_speed / 10) - 1; tempmax = this->cur_speed - (this->cur_speed / 10) - 1;
} else { } else {
tempmax = (this->breakdown_severity * max_speed) >> 8; tempmax = (this->breakdown_severity * max_speed) >> 8;
} }
} }
} }
if(this->breakdown_type == BREAKDOWN_LOW_SPEED) if (this->breakdown_type == BREAKDOWN_LOW_SPEED) {
tempmax = min(max_speed, this->breakdown_severity); tempmax = min(max_speed, this->breakdown_severity);
} }
}
if (this->cur_speed > max_speed) { if (this->cur_speed > max_speed) {
tempmax = max(this->cur_speed - (this->cur_speed / 10) - 1, max_speed); tempmax = max(this->cur_speed - (this->cur_speed / 10) - 1, max_speed);

6
src/ship_cmd.cpp
View File

@@ -382,15 +382,15 @@ static bool ShipAccelerate(Vehicle *v)
spd = min(v->cur_speed + 1, v->vcache.cached_max_speed); spd = min(v->cur_speed + 1, v->vcache.cached_max_speed);
spd = min(spd, v->current_order.GetMaxSpeed() * 2); spd = min(spd, v->current_order.GetMaxSpeed() * 2);
if(v->breakdown_ctr == 1 && v->breakdown_type == BREAKDOWN_LOW_POWER && v->cur_speed > (v->breakdown_severity * ShipVehInfo(v->engine_type)->max_speed) >> 8) { if (v->breakdown_ctr == 1 && v->breakdown_type == BREAKDOWN_LOW_POWER && v->cur_speed > (v->breakdown_severity * ShipVehInfo(v->engine_type)->max_speed) >> 8) {
if((v->tick_counter & 0x7) == 0 && v->cur_speed > 0) { if ((v->tick_counter & 0x7) == 0 && v->cur_speed > 0) {
spd = v->cur_speed - 1; spd = v->cur_speed - 1;
} else { } else {
spd = v->cur_speed; spd = v->cur_speed;
} }
} }
if(v->breakdown_ctr == 1 && v->breakdown_type == BREAKDOWN_LOW_SPEED) { if (v->breakdown_ctr == 1 && v->breakdown_type == BREAKDOWN_LOW_SPEED) {
spd = min(spd, v->breakdown_severity); spd = min(spd, v->breakdown_severity);
} }

2
src/train_cmd.cpp
View File

@@ -4079,7 +4079,7 @@ void Train::OnNewDay()
SetWindowClassesDirty(WC_TRAINS_LIST); SetWindowClassesDirty(WC_TRAINS_LIST);
} }
} }
if(IsEngine() || IsMultiheaded()) { if (IsEngine() || IsMultiheaded()) {
CheckVehicleBreakdown(this); CheckVehicleBreakdown(this);
} }
} }

2
src/vehicle.cpp
View File

@@ -1430,7 +1430,7 @@ bool Vehicle::HandleBreakdown()
if ((this->tick_counter & (this->type == VEH_TRAIN ? 3 : 1)) == 0) { if ((this->tick_counter & (this->type == VEH_TRAIN ? 3 : 1)) == 0) {
if (--this->breakdown_delay == 0) { if (--this->breakdown_delay == 0) {
this->breakdown_ctr = 0; this->breakdown_ctr = 0;
if(this->type == VEH_TRAIN) { if (this->type == VEH_TRAIN) {
CheckBreakdownFlags(Train::From(this->First())); CheckBreakdownFlags(Train::From(this->First()));
this->First()->MarkDirty(); this->First()->MarkDirty();
SetWindowDirty(WC_VEHICLE_VIEW, this->First()->index); SetWindowDirty(WC_VEHICLE_VIEW, this->First()->index);