DEFAULT_{INTRO,RETIRE}_DATE -> DEFAULT_{INTRO,RETIRE}_YEAR

ceeac · ceeac · commit fcd90db676ae · 2025-02-02T07:05:09.000Z
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@11630 8aca7d54-2c30-db11-9de9-000461428c89
diff --git a/src/simutrans/descriptor/building_desc.cc b/src/simutrans/descriptor/building_desc.cc
@@ -159,7 +159,7 @@ void building_desc_t::calc_checksum(checksum_t *chk) const
 			if(extra_data) PAKSET_INFO("clusters=","%d",extra_data);
 		case attraction_land:
 		case factory:
-			if(preservation_year_month!=DEFAULT_RETIRE_DATE*12) {
+			if(preservation_year_month!=DEFAULT_RETIRE_YEAR*12) {
 				PAKSET_INFO("preservation_year=","%d",preservation_year_month/12);
 				if(preservation_year_month%12) PAKSET_INFO("preservation_month=","%d",(preservation_year_month%12)+1);
 			}
diff --git a/src/simutrans/descriptor/intro_dates.h b/src/simutrans/descriptor/intro_dates.h
@@ -8,8 +8,8 @@
 
 
 // just some default intro and retirement dates, if nothing else is defined
-#define DEFAULT_INTRO_DATE (1900)
-#define DEFAULT_RETIRE_DATE (2999)
+#define DEFAULT_INTRO_YEAR  (1900)
+#define DEFAULT_RETIRE_YEAR (2999)
 
 
 #endif
diff --git a/src/simutrans/descriptor/obj_base_desc.cc b/src/simutrans/descriptor/obj_base_desc.cc
@@ -15,11 +15,11 @@ void obj_desc_timelined_t::calc_checksum(checksum_t *chk) const
 #if MSG_LEVEL>0
 	PAKSET_INFO("name=","%s",get_name());
 	if(get_copyright()) PAKSET_INFO("copyright=","%s",get_copyright());
-	if(intro_date!=DEFAULT_INTRO_DATE*12) {
+	if(intro_date!=DEFAULT_INTRO_YEAR*12) {
 		PAKSET_INFO("intro_year=","%d",intro_date/12);
 		if(intro_date%12) PAKSET_INFO("intro_month=","%d",(intro_date%12)+1);
 	}
-	if(retire_date!=DEFAULT_RETIRE_DATE*12) {
+	if(retire_date!=DEFAULT_RETIRE_YEAR*12) {
 		PAKSET_INFO("retire_year=","%d",retire_date/12);
 		if(retire_date%12) PAKSET_INFO("retire_month=","%d",(retire_date%12)+1);
 	}
diff --git a/src/simutrans/descriptor/reader/bridge_reader.cc b/src/simutrans/descriptor/reader/bridge_reader.cc
@@ -48,8 +48,8 @@ obj_desc_t *bridge_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 	desc->pillars_asymmetric = false;
 	desc->max_length = 0;
 	desc->max_height = 0;
-	desc->intro_date = DEFAULT_INTRO_DATE*12;
-	desc->retire_date = DEFAULT_RETIRE_DATE*12;
+	desc->intro_date = DEFAULT_INTRO_YEAR*12;
+	desc->retire_date = DEFAULT_RETIRE_YEAR*12;
 	desc->number_of_seasons = 0;
 
 	if(version == 1) {
diff --git a/src/simutrans/descriptor/reader/building_reader.cc b/src/simutrans/descriptor/reader/building_reader.cc
@@ -379,8 +379,8 @@ obj_desc_t * building_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 		desc->flags = (building_desc_t::flag_t)decode_uint8(p);
 		desc->distribution_weight = decode_uint8(p);
 
-		desc->intro_date = DEFAULT_INTRO_DATE*12;
-		desc->retire_date = DEFAULT_RETIRE_DATE*12;
+		desc->intro_date = DEFAULT_INTRO_YEAR*12;
+		desc->retire_date = DEFAULT_RETIRE_YEAR*12;
 		desc->animation_time = 300;
 	}
 	else {
@@ -401,8 +401,8 @@ obj_desc_t * building_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 		desc->flags = (building_desc_t::flag_t)decode_uint32(p);
 		desc->distribution_weight = 100;
 
-		desc->intro_date = DEFAULT_INTRO_DATE*12;
-		desc->retire_date = DEFAULT_RETIRE_DATE*12;
+		desc->intro_date = DEFAULT_INTRO_YEAR*12;
+		desc->retire_date = DEFAULT_RETIRE_YEAR*12;
 		desc->animation_time = 300;
 	}
 	// there are additional nodes for cursor/icon
@@ -448,7 +448,7 @@ obj_desc_t * building_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 
 	if( version < 10 ) {
 		// can always replace
-		desc->preservation_year_month = DEFAULT_RETIRE_DATE*12;
+		desc->preservation_year_month = DEFAULT_RETIRE_YEAR*12;
 	}
 
 	PAKSET_INFO("building_reader_t::read_node()",
diff --git a/src/simutrans/descriptor/reader/citycar_reader.cc b/src/simutrans/descriptor/reader/citycar_reader.cc
@@ -77,8 +77,8 @@ obj_desc_t * citycar_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 		// old version 0 ...
 		desc->distribution_weight = v;
 		desc->topspeed = kmh_to_speed(80);
-		desc->intro_date = DEFAULT_INTRO_DATE*12;
-		desc->retire_date = DEFAULT_RETIRE_DATE*12;
+		desc->intro_date = DEFAULT_INTRO_YEAR*12;
+		desc->retire_date = DEFAULT_RETIRE_YEAR*12;
 	}
 	// zero speed not allowed, we want something that moves!
 	if(  desc->topspeed<=16  ) {
diff --git a/src/simutrans/descriptor/reader/roadsign_reader.cc b/src/simutrans/descriptor/reader/roadsign_reader.cc
@@ -84,8 +84,8 @@ obj_desc_t * roadsign_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 		desc->price = decode_uint32(p);
 		desc->flags = decode_uint8(p);
 		desc->offset_left = 14;
-		desc->intro_date = DEFAULT_INTRO_DATE*12;
-		desc->retire_date = DEFAULT_RETIRE_DATE*12;
+		desc->intro_date = DEFAULT_INTRO_YEAR*12;
+		desc->retire_date = DEFAULT_RETIRE_YEAR*12;
 		desc->wtyp = road_wt;
 	}
 	else if(version==1) {
@@ -94,8 +94,8 @@ obj_desc_t * roadsign_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 		desc->price = 50000;
 		desc->flags = decode_uint8(p);
 		desc->offset_left = 14;
-		desc->intro_date = DEFAULT_INTRO_DATE*12;
-		desc->retire_date = DEFAULT_RETIRE_DATE*12;
+		desc->intro_date = DEFAULT_INTRO_YEAR*12;
+		desc->retire_date = DEFAULT_RETIRE_YEAR*12;
 		desc->wtyp = road_wt;
 	}
 	else {
diff --git a/src/simutrans/descriptor/reader/tunnel_reader.cc b/src/simutrans/descriptor/reader/tunnel_reader.cc
@@ -50,8 +50,8 @@ void tunnel_reader_t::convert_old_tunnel(tunnel_desc_t *desc)
 	}
 	desc->maintenance = 500;
 	desc->price = 200000;
-	desc->intro_date = DEFAULT_INTRO_DATE*12;
-	desc->retire_date = DEFAULT_RETIRE_DATE*12;
+	desc->intro_date = DEFAULT_INTRO_YEAR*12;
+	desc->retire_date = DEFAULT_RETIRE_YEAR*12;
 	desc->has_way = false;
 }
 
diff --git a/src/simutrans/descriptor/reader/vehicle_reader.cc b/src/simutrans/descriptor/reader/vehicle_reader.cc
@@ -68,7 +68,7 @@ obj_desc_t *vehicle_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 		desc->leader_count = decode_uint8(p);
 		desc->trailer_count = decode_uint8(p);
 
-		desc->retire_date = (DEFAULT_RETIRE_DATE*16);
+		desc->retire_date = (DEFAULT_RETIRE_YEAR*16);
 	}
 	else if(version == 2) {
 		// Versioned node, version 2
@@ -89,7 +89,7 @@ obj_desc_t *vehicle_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 		desc->trailer_count = decode_uint8(p);
 		desc->engine_type = decode_uint8(p);
 
-		desc->retire_date = (DEFAULT_RETIRE_DATE*16);
+		desc->retire_date = (DEFAULT_RETIRE_YEAR*16);
 	}
 	else if (version==3   ||  version==4  ||  version==5) {
 		// Versioned node, version 3 with retire date
@@ -288,8 +288,8 @@ obj_desc_t *vehicle_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 		desc->leader_count = (sint8)decode_uint16(p);
 		desc->trailer_count = (sint8)decode_uint16(p);
 
-		desc->intro_date = DEFAULT_INTRO_DATE*16;
-		desc->retire_date = (DEFAULT_RETIRE_DATE*16);
+		desc->intro_date = DEFAULT_INTRO_YEAR*16;
+		desc->retire_date = (DEFAULT_RETIRE_YEAR*16);
 		desc->gear = 64;
 	}
 
diff --git a/src/simutrans/descriptor/reader/way_reader.cc b/src/simutrans/descriptor/reader/way_reader.cc
@@ -55,8 +55,8 @@ obj_desc_t * way_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 		desc->maintenance = 800;
 		desc->topspeed = 999;
 		desc->max_weight = 999;
-		desc->intro_date = DEFAULT_INTRO_DATE*12;
-		desc->retire_date = DEFAULT_RETIRE_DATE*12;
+		desc->intro_date = DEFAULT_INTRO_YEAR*12;
+		desc->retire_date = DEFAULT_RETIRE_YEAR*12;
 		desc->wtyp = road_wt;
 		desc->styp = type_flat;
 		desc->draw_as_obj = false;
@@ -129,7 +129,7 @@ obj_desc_t * way_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 			desc->intro_date = (intro_date/16)*12 + (intro_date%16);
 			desc->wtyp = decode_uint8(p);
 			desc->styp = decode_uint8(p);
-			desc->retire_date = DEFAULT_RETIRE_DATE*12;
+			desc->retire_date = DEFAULT_RETIRE_YEAR*12;
 			desc->draw_as_obj = false;
 			desc->number_of_seasons = 0;
 		}
diff --git a/src/simutrans/descriptor/writer/bridge_writer.cc b/src/simutrans/descriptor/writer/bridge_writer.cc
@@ -108,10 +108,10 @@ void bridge_writer_t::write_obj(FILE* outfp, obj_node_t& parent, tabfileobj_t& o
 	uint16 axle_load = obj.get_int("axle_load",    9999);
 
 	// timeline
-	uint16 intro_date = obj.get_int("intro_year", DEFAULT_INTRO_DATE) * 12;
+	uint16 intro_date = obj.get_int("intro_year", DEFAULT_INTRO_YEAR) * 12;
 	intro_date += obj.get_int("intro_month", 1) - 1;
 
-	uint16 retire_date = obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12;
+	uint16 retire_date = obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12;
 	retire_date += obj.get_int("retire_month", 1) - 1;
 
 	sint8 number_of_seasons = 0;
diff --git a/src/simutrans/descriptor/writer/building_writer.cc b/src/simutrans/descriptor/writer/building_writer.cc
@@ -224,15 +224,15 @@ void building_writer_t::write_obj(FILE* fp, obj_node_t& parent, tabfileobj_t& ob
 
 	// timeline for buildings
 	uint16 const intro_date =
-		obj.get_int("intro_year", DEFAULT_INTRO_DATE) * 12 +
+		obj.get_int("intro_year", DEFAULT_INTRO_YEAR) * 12 +
 		obj.get_int("intro_month", 1) - 1;
 
 	uint16 const retire_date =
-		obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12 +
+		obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12 +
 		obj.get_int("retire_month", 1) - 1;
 
 	uint16 const preservation_date =
-		obj.get_int("preservation_year", DEFAULT_RETIRE_DATE) * 12 +
+		obj.get_int("preservation_year", DEFAULT_RETIRE_YEAR) * 12 +
 		obj.get_int("preservation_month", 1) - 1;
 
 	// capacity and price information.
diff --git a/src/simutrans/descriptor/writer/citycar_writer.cc b/src/simutrans/descriptor/writer/citycar_writer.cc
@@ -19,11 +19,11 @@ void citycar_writer_t::write_obj(FILE* fp, obj_node_t& parent, tabfileobj_t& obj
 	uint16 const dist_weight = obj.get_int("distributionweight", 1);
 
 	uint16 const intro_date =
-		obj.get_int("intro_year", DEFAULT_INTRO_DATE) * 12 +
+		obj.get_int("intro_year", DEFAULT_INTRO_YEAR) * 12 +
 		obj.get_int("intro_month", 1) - 1;
 
 	uint16 const retire_date =
-		obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12 +
+		obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12 +
 		obj.get_int("retire_month", 1) - 1;
 
 	uint16 const topspeed = obj.get_int("speed", 80) * 16;
diff --git a/src/simutrans/descriptor/writer/crossing_writer.cc b/src/simutrans/descriptor/writer/crossing_writer.cc
@@ -107,10 +107,10 @@ void crossing_writer_t::write_obj(FILE* fp, obj_node_t& parent, tabfileobj_t& ob
 		node.write_bytes(fp, sound_str.size(), sound_str.c_str());
 	}
 
-	uint16 intro_date  = obj.get_int("intro_year", DEFAULT_INTRO_DATE) * 12;
+	uint16 intro_date  = obj.get_int("intro_year", DEFAULT_INTRO_YEAR) * 12;
 	intro_date += obj.get_int("intro_month", 1) - 1;
 
-	uint16 retire_date  = obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12;
+	uint16 retire_date  = obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12;
 	retire_date += obj.get_int("retire_month", 1) - 1;
 
 	node.write_uint16(fp, intro_date);
diff --git a/src/simutrans/descriptor/writer/pedestrian_writer.cc b/src/simutrans/descriptor/writer/pedestrian_writer.cc
@@ -75,7 +75,7 @@ void pedestrian_writer_t::write_obj(FILE* fp, obj_node_t& parent, tabfileobj_t&
 		obj.get_int("intro_month", 1) - 1;
 
 	uint16 const retire_date =
-		obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12 +
+		obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12 +
 		obj.get_int("retire_month", 1) - 1;
 
 	node.write_version(fp, 2);
diff --git a/src/simutrans/descriptor/writer/roadsign_writer.cc b/src/simutrans/descriptor/writer/roadsign_writer.cc
@@ -121,11 +121,11 @@ void roadsign_writer_t::write_obj(FILE* fp, obj_node_t& parent, tabfileobj_t& ob
 	node.write_uint8 (fp, offset_left);
 	node.write_uint8 (fp, wtyp);
 
-	uint16 intro_date = obj.get_int("intro_year", DEFAULT_INTRO_DATE) * 12;
+	uint16 intro_date = obj.get_int("intro_year", DEFAULT_INTRO_YEAR) * 12;
 	intro_date += obj.get_int("intro_month", 1) - 1;
 	node.write_uint16(fp, intro_date);
 
-	uint16 retire_date = obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12;
+	uint16 retire_date = obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12;
 	retire_date += obj.get_int("retire_month", 1) - 1;
 	node.write_uint16(fp, retire_date);
 
diff --git a/src/simutrans/descriptor/writer/tunnel_writer.cc b/src/simutrans/descriptor/writer/tunnel_writer.cc
@@ -28,10 +28,10 @@ void tunnel_writer_t::write_obj(FILE* fp, obj_node_t& parent, tabfileobj_t& obj)
 	uint16 axle_load   = obj.get_int("axle_load",   9999);
 
 	// timeline
-	uint16 intro_date  = obj.get_int("intro_year", DEFAULT_INTRO_DATE) * 12;
+	uint16 intro_date  = obj.get_int("intro_year", DEFAULT_INTRO_YEAR) * 12;
 	intro_date += obj.get_int("intro_month", 1) - 1;
 
-	uint16 retire_date  = obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12;
+	uint16 retire_date  = obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12;
 	retire_date += obj.get_int("retire_month", 1) - 1;
 
 	// predefined string for directions
diff --git a/src/simutrans/descriptor/writer/vehicle_writer.cc b/src/simutrans/descriptor/writer/vehicle_writer.cc
@@ -130,11 +130,11 @@ void vehicle_writer_t::write_obj(FILE* fp, obj_node_t& parent, tabfileobj_t& obj
 	node.write_sint64(fp, fixed_cost);
 
 	// Introduction date (year * 12 + month)
-	uint16 intro_date  = obj.get_int("intro_year", DEFAULT_INTRO_DATE) * 12 + obj.get_int("intro_month", 1)-1;
+	uint16 intro_date  = obj.get_int("intro_year", DEFAULT_INTRO_YEAR) * 12 + obj.get_int("intro_month", 1)-1;
 	node.write_uint16(fp, intro_date);
 
 	// retire date (year * 12 + month)
-	uint16 retire_date = obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12 + obj.get_int("retire_month", 1)-1;
+	uint16 retire_date = obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12 + obj.get_int("retire_month", 1)-1;
 	node.write_uint16(fp, retire_date);
 
 	// Engine gear (power multiplier)
diff --git a/src/simutrans/descriptor/writer/way_obj_writer.cc b/src/simutrans/descriptor/writer/way_obj_writer.cc
@@ -35,10 +35,10 @@ void way_obj_writer_t::write_obj(FILE* outfp, obj_node_t& parent, tabfileobj_t&
 	uint32 maintenance = obj.get_int("maintenance", 100);
 	sint32 topspeed    = obj.get_int("topspeed",    999);
 
-	uint16 intro  = obj.get_int("intro_year", DEFAULT_INTRO_DATE) * 12;
+	uint16 intro  = obj.get_int("intro_year", DEFAULT_INTRO_YEAR) * 12;
 	intro +=        obj.get_int("intro_month", 1) - 1;
 
-	uint16 retire  = obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12;
+	uint16 retire  = obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12;
 	retire +=        obj.get_int("retire_month", 1) - 1;
 
 	uint8 wtyp     =  get_waytype(obj.get("waytype"));
diff --git a/src/simutrans/descriptor/writer/way_writer.cc b/src/simutrans/descriptor/writer/way_writer.cc
@@ -42,10 +42,10 @@ void way_writer_t::write_obj(FILE* outfp, obj_node_t& parent, tabfileobj_t& obj)
 	uint32 max_weight  = obj.get_int("max_weight",  999);
 	uint16 axle_load   = obj.get_int("axle_load",  9999);
 
-	uint16 intro = obj.get_int("intro_year", DEFAULT_INTRO_DATE) * 12;
+	uint16 intro = obj.get_int("intro_year", DEFAULT_INTRO_YEAR) * 12;
 	intro += obj.get_int("intro_month", 1) - 1;
 
-	uint16 retire = obj.get_int("retire_year", DEFAULT_RETIRE_DATE) * 12;
+	uint16 retire = obj.get_int("retire_year", DEFAULT_RETIRE_YEAR) * 12;
 	retire += obj.get_int("retire_month", 1) - 1;
 
 	uint8 wtyp = get_waytype(obj.get("waytype"));
diff --git a/src/simutrans/gui/citybuilding_edit.cc b/src/simutrans/gui/citybuilding_edit.cc
@@ -277,7 +277,7 @@ void citybuilding_edit_frame_t::change_item_info(sint32 entry)
 			buf.printf("%s: %i\n",translator::translate("Postrate"),desc->get_mail_level());
 
 			buf.printf("%s%u", translator::translate("\nBauzeit von"), desc->get_intro_year_month() / 12);
-			if(desc->get_retire_year_month()!=DEFAULT_RETIRE_DATE*12) {
+			if(desc->get_retire_year_month()!=DEFAULT_RETIRE_YEAR*12) {
 				buf.printf("%s%u", translator::translate("\nBauzeit bis"), desc->get_retire_year_month() / 12);
 			}
 			buf.append("\n");
diff --git a/src/simutrans/gui/curiosity_edit.cc b/src/simutrans/gui/curiosity_edit.cc
@@ -277,7 +277,7 @@ void curiosity_edit_frame_t::change_item_info(sint32 entry)
 			}
 
 			buf.printf("%s%u", translator::translate("\nBauzeit von"), desc->get_intro_year_month() / 12);
-			if(desc->get_retire_year_month()!=DEFAULT_RETIRE_DATE*12) {
+			if(desc->get_retire_year_month()!=DEFAULT_RETIRE_YEAR*12) {
 				buf.printf("%s%u", translator::translate("\nBauzeit bis"), desc->get_retire_year_month() / 12);
 			}
 			buf.append("\n");
diff --git a/src/simutrans/gui/depot_frame.cc b/src/simutrans/gui/depot_frame.cc
@@ -1537,7 +1537,7 @@ void depot_frame_t::update_vehicle_info_text(scr_coord pos)
 		labels[LB_VEH_WEIGHT]->buf().printf( "%s %4.1ft\n", translator::translate("Weight:"), veh_type->get_weight() / 1000.0 );
 		labels[LB_VEH_DATE]->buf().printf( "%s: %s - ", translator::translate("Available"), translator::get_short_date(veh_type->get_intro_year_month() / 12, veh_type->get_intro_year_month() % 12) );
 
-		if(  veh_type->get_retire_year_month() != DEFAULT_RETIRE_DATE * 12  ) {
+		if(  veh_type->get_retire_year_month() != DEFAULT_RETIRE_YEAR * 12  ) {
 			labels[LB_VEH_DATE]->buf().printf( "%s\n", translator::get_short_date(veh_type->get_retire_year_month() / 12, veh_type->get_retire_year_month() % 12) );
 		}
 
diff --git a/src/simutrans/gui/factory_edit.cc b/src/simutrans/gui/factory_edit.cc
@@ -329,7 +329,7 @@ void factory_edit_frame_t::change_item_info(sint32 entry)
 			buf.printf( translator::translate("Mail Demand %d\n"),      f.get_mail_demand() != 65535 ? f.get_mail_demand() : f.get_pax_level() >> 2);
 
 			buf.printf("%s%u", translator::translate("\nBauzeit von"), desc->get_intro_year_month() / 12);
-			if(desc->get_retire_year_month()!=DEFAULT_RETIRE_DATE*12) {
+			if(desc->get_retire_year_month()!=DEFAULT_RETIRE_YEAR*12) {
 				buf.printf("%s%u", translator::translate("\nBauzeit bis"), desc->get_retire_year_month() / 12);
 			}
 
diff --git a/src/simutrans/gui/vehiclelist_frame.cc b/src/simutrans/gui/vehiclelist_frame.cc
@@ -93,7 +93,7 @@ vehiclelist_stats_t::vehiclelist_stats_t(const vehicle_desc_t *v) :
 	part2.clear();
 	part2.printf( "%s %4.1ft\n", translator::translate( "Weight:" ), veh->get_weight() / 1000.0 );
 	part2.printf( "%s: %s - ", translator::translate( "Available" ), translator::get_short_date( veh->get_intro_year_month() / 12, veh->get_intro_year_month() % 12 ) );
-	if( veh->get_retire_year_month() != DEFAULT_RETIRE_DATE * 12 ) {
+	if( veh->get_retire_year_month() != DEFAULT_RETIRE_YEAR * 12 ) {
 		part2.printf( "%s", translator::get_short_date( veh->get_retire_year_month() / 12, veh->get_retire_year_month() % 12 ) );
 	}
 	if( char const* const copyright = veh->get_copyright() ) {
diff --git a/src/simutrans/obj/gebaeude.cc b/src/simutrans/obj/gebaeude.cc
@@ -745,7 +745,7 @@ void gebaeude_t::info(cbuffer_t & buf) const
 
 		building_desc_t const& h = *tile->get_desc();
 		buf.printf("%s%u", translator::translate("\nBauzeit von"), h.get_intro_year_month() / 12);
-		if (h.get_retire_year_month() != DEFAULT_RETIRE_DATE * 12) {
+		if (h.get_retire_year_month() != DEFAULT_RETIRE_YEAR * 12) {
 			buf.printf("%s%u", translator::translate("\nBauzeit bis"), h.get_retire_year_month() / 12);
 		}
 
diff --git a/src/simutrans/world/simworld.cc b/src/simutrans/world/simworld.cc
@@ -2891,7 +2891,7 @@ void karte_t::new_month()
 		koord::locality_factor = settings.get_locality_factor( last_year + 1 );
 		need_locality_update = (old_locality_factor != koord::locality_factor);
 
-		if( current_month > DEFAULT_RETIRE_DATE * 12 ) {
+		if( current_month > DEFAULT_RETIRE_YEAR * 12 ) {
 			// switch off timeline after 2999, since everything retires
 			settings.set_use_timeline( 0 );
 			dbg->warning( "karte_t::new_month()", "Timeline disabled after the year 2999" );

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ void building_desc_t::calc_checksum(checksum_t *chk) const`
`159`	`159`	`if(extra_data) PAKSET_INFO("clusters=","%d",extra_data);`
`160`	`160`	`case attraction_land:`
`161`	`161`	`case factory:`
`162`		`- if(preservation_year_month!=DEFAULT_RETIRE_DATE*12) {`
	`162`	`+ if(preservation_year_month!=DEFAULT_RETIRE_YEAR*12) {`
`163`	`163`	`PAKSET_INFO("preservation_year=","%d",preservation_year_month/12);`
`164`	`164`	`if(preservation_year_month%12) PAKSET_INFO("preservation_month=","%d",(preservation_year_month%12)+1);`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ void obj_desc_timelined_t::calc_checksum(checksum_t *chk) const`
`15`	`15`	`#if MSG_LEVEL>0`
`16`	`16`	`PAKSET_INFO("name=","%s",get_name());`
`17`	`17`	`if(get_copyright()) PAKSET_INFO("copyright=","%s",get_copyright());`
`18`		`- if(intro_date!=DEFAULT_INTRO_DATE*12) {`
	`18`	`+ if(intro_date!=DEFAULT_INTRO_YEAR*12) {`
`19`	`19`	`PAKSET_INFO("intro_year=","%d",intro_date/12);`
`20`	`20`	`if(intro_date%12) PAKSET_INFO("intro_month=","%d",(intro_date%12)+1);`
`21`	`21`	`}`
`22`		`- if(retire_date!=DEFAULT_RETIRE_DATE*12) {`
	`22`	`+ if(retire_date!=DEFAULT_RETIRE_YEAR*12) {`
`23`	`23`	`PAKSET_INFO("retire_year=","%d",retire_date/12);`
`24`	`24`	`if(retire_date%12) PAKSET_INFO("retire_month=","%d",(retire_date%12)+1);`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ void tunnel_reader_t::convert_old_tunnel(tunnel_desc_t *desc)`
`50`	`50`	`}`
`51`	`51`	`desc->maintenance = 500;`
`52`	`52`	`desc->price = 200000;`
`53`		`- desc->intro_date = DEFAULT_INTRO_DATE*12;`
`54`		`- desc->retire_date = DEFAULT_RETIRE_DATE*12;`
	`53`	`+ desc->intro_date = DEFAULT_INTRO_YEAR*12;`
	`54`	`+ desc->retire_date = DEFAULT_RETIRE_YEAR*12;`
`55`	`55`	`desc->has_way = false;`
`56`	`56`	`}`
`57`	`57`