cpp/openttd-patchpack/source Changeset - r15350:38997da618b5

Changeset - r15350:38997da618b5

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

yexo - 14 years ago 2010-06-20 19:13:02
yexo@openttd.org

(svn r20003) -Feature [FS#3886]: [NewGRF] var 43 depot build date for railtypes

8 files changed with 27 insertions and 2 deletions:

src/depot_base.h

src/newgrf_railtype.cpp

src/rail_cmd.cpp

src/road_cmd.cpp

src/saveload/afterload.cpp

src/saveload/depot_sl.cpp

src/saveload/saveload.cpp

src/water_cmd.cpp

0 comments (0 inline, 0 general)

src/depot_base.h

➞

Show inline comments

@@ @@ -24,6 +24,7 @@ struct Depot : DepotPool::PoolItem<&_dep @@
 	TileIndex xy;
 	uint16 town_cn;    ///< The Nth depot for this town (consecutive number)
 	Date build_date;   ///< Date of construction
 	Depot(TileIndex xy = INVALID_TILE) : xy(xy) {}
 	~Depot();

src/newgrf_railtype.cpp

➞

Show inline comments

@@ @@ -15,6 +15,9 @@ @@
 #include "newgrf_railtype.h"
 #include "newgrf_spritegroup.h"
 #include "core/bitmath_func.hpp"
 #include "date_func.h"
 #include "depot_base.h"
 #include "rail_map.h"
 static uint32 RailTypeGetRandomBits(const ResolverObject *object)
+{
@@ @@ -41,6 +44,7 @@ static uint32 RailTypeGetVariable(const @@
 			case 0x40: return 0;
 			case 0x41: return 0;
 			case 0x42: return 0;
 			case 0x43: return _date;
+		}
+	}
@@ @@ -48,6 +52,9 @@ static uint32 RailTypeGetVariable(const @@
 		case 0x40: return GetTerrainType(tile);
 		case 0x41: return 0;
 		case 0x42: return IsLevelCrossingTile(tile) && IsCrossingBarred(tile);
 		case 0x43:
 			if (IsRailDepotTile(tile)) return Depot::GetByTile(tile)->build_date;
 			return _date;
+	}
 	DEBUG(grf, 1, "Unhandled rail type tile property 0x%X", variable);

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -37,6 +37,7 @@ @@
 #include "pbs.h"
 #include "company_base.h"
 #include "core/backup_type.hpp"
 #include "date_func.h"
 #include "table/strings.h"
 #include "table/sprites.h"
@@ @@ -869,6 +870,7 @@ CommandCost CmdBuildTrainDepot(TileIndex @@
 	if (flags & DC_EXEC) {
 		Depot *d = new Depot(tile);
 		d->build_date = _date;
 		MakeRailDepot(tile, _current_company, d->index, dir, railtype);
 		MarkTileDirtyByTile(tile);
@@ @@ -2644,6 +2646,7 @@ static void GetTileDesc_Track(TileIndex @@
 					td->rail_speed = 61;
+				}
+			}
 			td->build_date = Depot::GetByTile(tile)->build_date;
 			break;
 		default:

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -36,6 +36,7 @@ @@
 #include "company_base.h"
 #include "core/random_func.hpp"
 #include "newgrf_railtype.h"
 #include "date_func.h"
 #include "table/strings.h"
@@ @@ -909,6 +910,7 @@ CommandCost CmdBuildRoadDepot(TileIndex @@
 	if (flags & DC_EXEC) {
 		Depot *dep = new Depot(tile);
 		dep->build_date = _date;
 		MakeRoadDepot(tile, _current_company, dep->index, dir, rt);
 		MarkTileDirtyByTile(tile);
@@ @@ -1534,6 +1536,7 @@ static void GetTileDesc_Road(TileIndex t @@
 		case ROAD_TILE_DEPOT:
 			td->str = STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT;
 			road_owner = GetTileOwner(tile); // Tile has only one owner, roadtype does not matter
 			td->build_date = Depot::GetByTile(tile)->build_date;
 			break;
 		default: {

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -2126,6 +2126,11 @@ bool AfterLoadGame() @@
 		FOR_ALL_DEPOTS(d) MakeDefaultName(d);
+	}
 	if (CheckSavegameVersion(142)) {
 		Depot *d;
 		FOR_ALL_DEPOTS(d) d->build_date = _date;
+	}
 	/* Road stops is 'only' updating some caches */
 	AfterLoadRoadStops();
 	AfterLoadLabelMaps();

src/saveload/depot_sl.cpp

➞

Show inline comments

@@ @@ -24,6 +24,7 @@ static const SaveLoad _depot_desc[] = { @@
 	 SLE_CONDREF(Depot, town,       REF_TOWN,                 141, SL_MAX_VERSION),
 	 SLE_CONDVAR(Depot, town_cn,    SLE_UINT16,               141, SL_MAX_VERSION),
 	 SLE_CONDSTR(Depot, name,       SLE_STR, 0,               141, SL_MAX_VERSION),
 	 SLE_CONDVAR(Depot, build_date, SLE_INT32,                142, SL_MAX_VERSION),
 	 SLE_END()
 };

src/saveload/saveload.cpp

➞

Show inline comments

@@ @@ -47,7 +47,7 @@ @@
 #include "saveload_internal.h"
-extern const uint16 SAVEGAME_VERSION = 141;
+extern const uint16 SAVEGAME_VERSION = 142;
 SavegameType _savegame_type; ///< type of savegame we are loading

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -35,6 +35,7 @@ @@
 #include "ai/ai.hpp"
 #include "core/random_func.hpp"
 #include "core/backup_type.hpp"
 #include "date_func.h"
 #include "table/sprites.h"
 #include "table/strings.h"
@@ @@ -131,6 +132,7 @@ CommandCost CmdBuildShipDepot(TileIndex @@
 	if (flags & DC_EXEC) {
 		Depot *depot = new Depot(tile);
 		depot->build_date = _date;
 		MakeShipDepot(tile,  _current_company, depot->index, DEPOT_NORTH, axis, wc1);
 		MakeShipDepot(tile2, _current_company, depot->index, DEPOT_SOUTH, axis, wc2);
@@ @@ -729,7 +731,10 @@ static void GetTileDesc_Water(TileIndex @@
 			break;
 		case WATER_TILE_COAST: td->str = STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK; break;
 		case WATER_TILE_LOCK : td->str = STR_LAI_WATER_DESCRIPTION_LOCK;               break;
 		case WATER_TILE_DEPOT: td->str = STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT;         break;
 		case WATER_TILE_DEPOT:
 			td->str = STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT;
 			td->build_date = Depot::GetByTile(tile)->build_date;
 			break;
 		default: NOT_REACHED(); break;
+	}

0 comments (0 inline, 0 general)