(svn r17037) -Fix (r17036): 'Polygonal Capabilities' are a core feature of windows.

3 files changed, 54 insertions, 54 deletions

diff --git a/src/economy.cpp b/src/economy.cpp
index a9cb34aea..a3c880068 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -746,11 +746,11 @@ void StartupEconomy()
 		/* Apply difficulty settings */
 		uint mod = 1;
 		switch (_price_base_specs[i].category) {
-			case PC_RUNNING:
+			case PCAT_RUNNING:
 				mod = _settings_game.difficulty.vehicle_costs;
 				break;
 
-			case PC_CONSTRUCTION:
+			case PCAT_CONSTRUCTION:
 				mod = _settings_game.difficulty.construction_cost;
 				break;
 
diff --git a/src/economy_type.h b/src/economy_type.h
index 48988bb46..4f32d806c 100644
--- a/src/economy_type.h
+++ b/src/economy_type.h
@@ -126,9 +126,9 @@ enum ExpensesType {
  * Categories of a price bases.
  */
 enum PriceCategory {
-	PC_NONE,         ///< No category
-	PC_RUNNING,      ///< Price is affected by "vehicle running cost" difficulty setting
-	PC_CONSTRUCTION, ///< Price is affected by "construction cost" difficulty setting
+	PCAT_NONE,         ///< Not affected by difficulty settings
+	PCAT_RUNNING,      ///< Price is affected by "vehicle running cost" difficulty setting
+	PCAT_CONSTRUCTION, ///< Price is affected by "construction cost" difficulty setting
 };
 
 /**
diff --git a/src/table/pricebase.h b/src/table/pricebase.h
index 1703dd8c0..4b00b4dec 100644
--- a/src/table/pricebase.h
+++ b/src/table/pricebase.h
@@ -3,53 +3,53 @@
 /** @file pricebase.h Price Bases */
 
 static PriceBaseSpec _price_base_specs[NUM_PRICES] = {
-	{    100, PC_NONE        }, ///< station_value
-	{    100, PC_CONSTRUCTION}, ///< build_rail
-	{     95, PC_CONSTRUCTION}, ///< build_road
-	{     65, PC_CONSTRUCTION}, ///< build_signals
-	{    275, PC_CONSTRUCTION}, ///< build_bridge
-	{    600, PC_CONSTRUCTION}, ///< build_train_depot
-	{    500, PC_CONSTRUCTION}, ///< build_road_depot
-	{    700, PC_CONSTRUCTION}, ///< build_ship_depot
-	{    450, PC_CONSTRUCTION}, ///< build_tunnel
-	{    200, PC_CONSTRUCTION}, ///< train_station_track
-	{    180, PC_CONSTRUCTION}, ///< train_station_length
-	{    600, PC_CONSTRUCTION}, ///< build_airport
-	{    200, PC_CONSTRUCTION}, ///< build_bus_station
-	{    200, PC_CONSTRUCTION}, ///< build_truck_station
-	{    350, PC_CONSTRUCTION}, ///< build_dock
-	{ 400000, PC_CONSTRUCTION}, ///< build_railvehicle
-	{   2000, PC_CONSTRUCTION}, ///< build_railwagon
-	{ 700000, PC_CONSTRUCTION}, ///< aircraft_base
-	{  14000, PC_CONSTRUCTION}, ///< roadveh_base
-	{  65000, PC_CONSTRUCTION}, ///< ship_base
-	{     20, PC_CONSTRUCTION}, ///< build_trees
-	{    250, PC_CONSTRUCTION}, ///< terraform
-	{     20, PC_CONSTRUCTION}, ///< clear_grass
-	{     40, PC_CONSTRUCTION}, ///< clear_roughland
-	{    200, PC_CONSTRUCTION}, ///< clear_rocks
-	{    500, PC_CONSTRUCTION}, ///< clear_fields
-	{     20, PC_CONSTRUCTION}, ///< remove_trees
-	{    -70, PC_CONSTRUCTION}, ///< remove_rail
-	{     10, PC_CONSTRUCTION}, ///< remove_signals
-	{     50, PC_CONSTRUCTION}, ///< clear_bridge
-	{     80, PC_CONSTRUCTION}, ///< remove_train_depot
-	{     80, PC_CONSTRUCTION}, ///< remove_road_depot
-	{     90, PC_CONSTRUCTION}, ///< remove_ship_depot
-	{     30, PC_CONSTRUCTION}, ///< clear_tunnel
-	{  10000, PC_CONSTRUCTION}, ///< clear_water
-	{     50, PC_CONSTRUCTION}, ///< remove_rail_station
-	{     30, PC_CONSTRUCTION}, ///< remove_airport
-	{     50, PC_CONSTRUCTION}, ///< remove_bus_station
-	{     50, PC_CONSTRUCTION}, ///< remove_truck_station
-	{     55, PC_CONSTRUCTION}, ///< remove_dock
-	{   1600, PC_CONSTRUCTION}, ///< remove_house
-	{     40, PC_CONSTRUCTION}, ///< remove_road
-	{   5600, PC_RUNNING     }, ///< running_rail[0] steam
-	{   5200, PC_RUNNING     }, ///< running_rail[1] diesel
-	{   4800, PC_RUNNING     }, ///< running_rail[2] electric
-	{   9600, PC_RUNNING     }, ///< aircraft_running
-	{   1600, PC_RUNNING     }, ///< roadveh_running
-	{   5600, PC_RUNNING     }, ///< ship_running
-	{1000000, PC_CONSTRUCTION}, ///< build_industry
+	{    100, PCAT_NONE        }, ///< station_value
+	{    100, PCAT_CONSTRUCTION}, ///< build_rail
+	{     95, PCAT_CONSTRUCTION}, ///< build_road
+	{     65, PCAT_CONSTRUCTION}, ///< build_signals
+	{    275, PCAT_CONSTRUCTION}, ///< build_bridge
+	{    600, PCAT_CONSTRUCTION}, ///< build_train_depot
+	{    500, PCAT_CONSTRUCTION}, ///< build_road_depot
+	{    700, PCAT_CONSTRUCTION}, ///< build_ship_depot
+	{    450, PCAT_CONSTRUCTION}, ///< build_tunnel
+	{    200, PCAT_CONSTRUCTION}, ///< train_station_track
+	{    180, PCAT_CONSTRUCTION}, ///< train_station_length
+	{    600, PCAT_CONSTRUCTION}, ///< build_airport
+	{    200, PCAT_CONSTRUCTION}, ///< build_bus_station
+	{    200, PCAT_CONSTRUCTION}, ///< build_truck_station
+	{    350, PCAT_CONSTRUCTION}, ///< build_dock
+	{ 400000, PCAT_CONSTRUCTION}, ///< build_railvehicle
+	{   2000, PCAT_CONSTRUCTION}, ///< build_railwagon
+	{ 700000, PCAT_CONSTRUCTION}, ///< aircraft_base
+	{  14000, PCAT_CONSTRUCTION}, ///< roadveh_base
+	{  65000, PCAT_CONSTRUCTION}, ///< ship_base
+	{     20, PCAT_CONSTRUCTION}, ///< build_trees
+	{    250, PCAT_CONSTRUCTION}, ///< terraform
+	{     20, PCAT_CONSTRUCTION}, ///< clear_grass
+	{     40, PCAT_CONSTRUCTION}, ///< clear_roughland
+	{    200, PCAT_CONSTRUCTION}, ///< clear_rocks
+	{    500, PCAT_CONSTRUCTION}, ///< clear_fields
+	{     20, PCAT_CONSTRUCTION}, ///< remove_trees
+	{    -70, PCAT_CONSTRUCTION}, ///< remove_rail
+	{     10, PCAT_CONSTRUCTION}, ///< remove_signals
+	{     50, PCAT_CONSTRUCTION}, ///< clear_bridge
+	{     80, PCAT_CONSTRUCTION}, ///< remove_train_depot
+	{     80, PCAT_CONSTRUCTION}, ///< remove_road_depot
+	{     90, PCAT_CONSTRUCTION}, ///< remove_ship_depot
+	{     30, PCAT_CONSTRUCTION}, ///< clear_tunnel
+	{  10000, PCAT_CONSTRUCTION}, ///< clear_water
+	{     50, PCAT_CONSTRUCTION}, ///< remove_rail_station
+	{     30, PCAT_CONSTRUCTION}, ///< remove_airport
+	{     50, PCAT_CONSTRUCTION}, ///< remove_bus_station
+	{     50, PCAT_CONSTRUCTION}, ///< remove_truck_station
+	{     55, PCAT_CONSTRUCTION}, ///< remove_dock
+	{   1600, PCAT_CONSTRUCTION}, ///< remove_house
+	{     40, PCAT_CONSTRUCTION}, ///< remove_road
+	{   5600, PCAT_RUNNING     }, ///< running_rail[0] steam
+	{   5200, PCAT_RUNNING     }, ///< running_rail[1] diesel
+	{   4800, PCAT_RUNNING     }, ///< running_rail[2] electric
+	{   9600, PCAT_RUNNING     }, ///< aircraft_running
+	{   1600, PCAT_RUNNING     }, ///< roadveh_running
+	{   5600, PCAT_RUNNING     }, ///< ship_running
+	{1000000, PCAT_CONSTRUCTION}, ///< build_industry
 };