Merge branch 'infrastructure_sharing-sx' into jgrpp

Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-06 23:11:49 +01:00
34 changed files with 808 additions and 64 deletions

View File

@@ -69,6 +69,7 @@
#include "void_map.h"
#include "station_base.h"
#include "infrastructure_func.h"
#include "table/strings.h"
#include "table/settings.h"
@@ -1309,6 +1310,28 @@ static bool StationCatchmentChanged(int32 p1)
return true;
}
static bool CheckSharingRail(int32 p1)
{
if (!CheckSharingChangePossible(VEH_TRAIN)) return false;
UpdateAllBlockSignals();
return true;
}
static bool CheckSharingRoad(int32 p1)
{
return CheckSharingChangePossible(VEH_ROAD);
}
static bool CheckSharingWater(int32 p1)
{
return CheckSharingChangePossible(VEH_SHIP);
}
static bool CheckSharingAir(int32 p1)
{
return CheckSharingChangePossible(VEH_AIRCRAFT);
}
static bool MaxVehiclesChanged(int32 p1)
{
InvalidateWindowClassesData(WC_BUILD_TOOLBAR);
@@ -1316,7 +1339,6 @@ static bool MaxVehiclesChanged(int32 p1)
return true;
}
#ifdef ENABLE_NETWORK
static bool UpdateClientName(int32 p1)