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

Merge branch 'improved_breakdowns-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/settings.cpp
This commit is contained in:
Jonathan G Rennison
2016-02-02 23:09:29 +00:00
parent 41e0d65d6a 6890e0af35
commit 31a5baf555
17 changed files with 144 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/settings.cpp
View File

@@ -1026,7 +1026,7 @@ static bool RoadVehAccelerationModelChanged(int32 p1)
RoadVehicle *rv;
FOR_ALL_ROADVEHICLES(rv) {
if (rv->IsFrontEngine()) {
rv->breakdown_chance = 128;
rv->breakdown_chance_factor = 128;
}
}
}
@@ -1349,6 +1349,33 @@ static bool MaxVehiclesChanged(int32 p1)
return true;
}
static bool ImprovedBreakdownsSettingChanged(int32 p1)
{
if (!_settings_game.vehicle.improved_breakdowns) return true;
Vehicle *v;
FOR_ALL_VEHICLES(v) {
switch(v->type) {
case VEH_TRAIN:
if (v->IsFrontEngine()) {
v->breakdown_chance_factor = 128;
Train::From(v)->UpdateAcceleration();
}
break;
case VEH_ROAD:
if (v->IsFrontEngine()) {
v->breakdown_chance_factor = 128;
}
break;
default:
break;
}
}
return true;
}
#ifdef ENABLE_NETWORK
static bool UpdateClientName(int32 p1)