translate vehikelbauer_t

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@8011 8aca7d54-2c30-db11-9de9-000461428c89

bauer/vehikelbauer.cc

@@ -60,12 +60,12 @@ static sint32 default_speedbonus[8] =
 	60	// narrowgauge
 };
 
-bool vehikelbauer_t::speedbonus_init(const std::string &objfilename)
+bool vehicle_builder_t::speedbonus_init(const std::string &objfilename)
 {
 	tabfile_t bonusconf;
 	// first take user data, then user global data
 	if (!bonusconf.open((objfilename+"config/speedbonus.tab").c_str())) {
-		dbg->warning("vehikelbauer_t::speedbonus_init()", "Can't read speedbonus.tab" );
+		dbg->warning("vehicle_builder_t::speedbonus_init()", "Can't read speedbonus.tab" );
 		return false;
 	}
 
@@ -78,7 +78,7 @@ bool vehikelbauer_t::speedbonus_init(const std::string &objfilename)
 	for(  int j=0;  j<8;  j++  ) {
 		int *tracks = contents.get_ints(weg_t::waytype_to_string(j==3?air_wt:(waytype_t)(j+1)));
 		if((tracks[0]&1)==1) {
-			dbg->warning( "vehikelbauer_t::speedbonus_init()", "Ill formed line in speedbonus.tab\nFormat is year,speed[,year,speed]!" );
+			dbg->warning( "vehicle_builder_t::speedbonus_init()", "Ill formed line in speedbonus.tab\nFormat is year,speed[,year,speed]!" );
 			tracks[0]--;
 		}
 		speedbonus[j].resize( tracks[0]/2 );
@@ -93,7 +93,7 @@ bool vehikelbauer_t::speedbonus_init(const std::string &objfilename)
 }
 
 
-sint32 vehikelbauer_t::get_speedbonus( sint32 monthyear, waytype_t wt )
+sint32 vehicle_builder_t::get_speedbonus( sint32 monthyear, waytype_t wt )
 {
 	const int typ = wt==air_wt ? 3 : (wt-1)&7;
 
@@ -143,7 +143,7 @@ sint32 vehikelbauer_t::get_speedbonus( sint32 monthyear, waytype_t wt )
 }
 
 
-void vehikelbauer_t::rdwr_speedbonus(loadsave_t *file)
+void vehicle_builder_t::rdwr_speedbonus(loadsave_t *file)
 {
 	for(  int j=0;  j<8;  j++  ) {
 		uint32 count = speedbonus[j].get_count();
@@ -162,7 +162,7 @@ void vehikelbauer_t::rdwr_speedbonus(loadsave_t *file)
 }
 
 
-vehicle_t* vehikelbauer_t::build(koord3d k, player_t* player, convoi_t* cnv, const vehikel_besch_t* vb )
+vehicle_t* vehicle_builder_t::build(koord3d k, player_t* player, convoi_t* cnv, const vehikel_besch_t* vb )
 {
 	vehicle_t* v;
 	switch (vb->get_waytype()) {
@@ -176,7 +176,7 @@ vehicle_t* vehikelbauer_t::build(koord3d k, player_t* player, convoi_t* cnv, con
 		case narrowgauge_wt:v = new narrowgauge_vehicle_t(k, vb, player, cnv); break;
 
 		default:
-			dbg->fatal("vehikelbauer_t::build()", "cannot built a vehicle with waytype %i", vb->get_waytype());
+			dbg->fatal("vehicle_builder_t::build()", "cannot built a vehicle with waytype %i", vb->get_waytype());
 	}
 
 	player->book_new_vehicle(-(sint64)vb->get_preis(), k.get_2d(), vb->get_waytype() );
@@ -186,14 +186,14 @@ vehicle_t* vehikelbauer_t::build(koord3d k, player_t* player, convoi_t* cnv, con
 
 
 
-bool vehikelbauer_t::register_desc(const vehikel_besch_t *desc)
+bool vehicle_builder_t::register_desc(const vehikel_besch_t *desc)
 {
 	// register waytype list
 	const int idx = GET_WAYTYPE_INDEX( desc->get_waytype() );
 
 	const vehikel_besch_t *old_desc = name_fahrzeuge.get( desc->get_name() );
 	if(  old_desc  ) {
-		dbg->warning( "vehikelbauer_t::register_desc()", "Object %s was overlaid by addon!", desc->get_name() );
+		dbg->warning( "vehicle_builder_t::register_desc()", "Object %s was overlaid by addon!", desc->get_name() );
 		name_fahrzeuge.remove( desc->get_name() );
 		typ_fahrzeuge[idx].remove(old_desc);
 	}
@@ -248,10 +248,10 @@ static bool compare_vehikel_desc(const vehikel_besch_t* a, const vehikel_besch_t
 }
 
 
-bool vehikelbauer_t::successfully_loaded()
+bool vehicle_builder_t::successfully_loaded()
 {
 	// first: check for bonus tables
-	DBG_MESSAGE("vehikelbauer_t::sort_lists()","called");
+	DBG_MESSAGE("vehicle_builder_t::sort_lists()","called");
 	for(  int wt_idx=0;  wt_idx<9;  wt_idx++  ) {
 		slist_tpl<const vehikel_besch_t*>& typ_liste = typ_fahrzeuge[wt_idx];
 		uint count = typ_liste.get_count();
@@ -274,13 +274,13 @@ bool vehikelbauer_t::successfully_loaded()
 
 
 
-const vehikel_besch_t *vehikelbauer_t::get_info(const char *name)
+const vehikel_besch_t *vehicle_builder_t::get_info(const char *name)
 {
 	return name_fahrzeuge.get(name);
 }
 
 
-slist_tpl<vehikel_besch_t const*> const & vehikelbauer_t::get_info(waytype_t const typ)
+slist_tpl<vehikel_besch_t const*> const & vehicle_builder_t::get_info(waytype_t const typ)
 {
 	return typ_fahrzeuge[GET_WAYTYPE_INDEX(typ)];
 }
@@ -291,7 +291,7 @@ slist_tpl<vehikel_besch_t const*> const & vehikelbauer_t::get_info(waytype_t con
  * tries to get best with but adds a little random action
  * @author prissi
  */
-const vehikel_besch_t *vehikelbauer_t::vehikel_search( waytype_t wt, const uint16 month_now, const uint32 target_weight, const sint32 target_speed, const ware_besch_t * target_freight, bool include_electric, bool not_obsolete )
+const vehikel_besch_t *vehicle_builder_t::vehikel_search( waytype_t wt, const uint16 month_now, const uint32 target_weight, const sint32 target_speed, const ware_besch_t * target_freight, bool include_electric, bool not_obsolete )
 {
 	const vehikel_besch_t *desc = NULL;
 	sint32 besch_index = -100000;
@@ -357,7 +357,7 @@ const vehikel_besch_t *vehikelbauer_t::vehikel_search( waytype_t wt, const uint1
 			if(  desc==NULL  ||  difference<(int)simrand(25)    ) {
 				// then we want this vehicle!
 				desc = test_desc;
-				DBG_MESSAGE( "vehikelbauer_t::vehikel_search","Found car %s",desc->get_name());
+				DBG_MESSAGE( "vehicle_builder_t::vehikel_search","Found car %s",desc->get_name());
 			}
 		}
 
@@ -385,13 +385,13 @@ const vehikel_besch_t *vehikelbauer_t::vehikel_search( waytype_t wt, const uint1
 				// then we want this vehicle!
 				desc = test_desc;
 				besch_index = current_index;
-				DBG_MESSAGE( "vehikelbauer_t::vehikel_search","Found engine %s",desc->get_name());
+				DBG_MESSAGE( "vehicle_builder_t::vehikel_search","Found engine %s",desc->get_name());
 			}
 		}
 	}
 	// no vehicle found!
 	if(  desc==NULL  ) {
-		DBG_MESSAGE( "vehikelbauer_t::vehikel_search()","could not find a suitable vehicle! (speed %i, weight %i)",target_speed,target_weight);
+		DBG_MESSAGE( "vehicle_builder_t::vehikel_search()","could not find a suitable vehicle! (speed %i, weight %i)",target_speed,target_weight);
 	}
 	return desc;
 }
@@ -403,7 +403,7 @@ const vehikel_besch_t *vehikelbauer_t::vehikel_search( waytype_t wt, const uint1
  * if prev_desc==NULL, then the convoi must be able to lead a convoi
  * @author prissi
  */
-const vehikel_besch_t *vehikelbauer_t::get_best_matching( waytype_t wt, const uint16 month_now, const uint32 target_weight, const uint32 target_power, const sint32 target_speed, const ware_besch_t * target_freight, bool not_obsolete, const vehikel_besch_t *prev_veh, bool is_last )
+const vehikel_besch_t *vehicle_builder_t::get_best_matching( waytype_t wt, const uint16 month_now, const uint32 target_weight, const uint32 target_power, const sint32 target_speed, const ware_besch_t * target_freight, bool not_obsolete, const vehikel_besch_t *prev_veh, bool is_last )
 {
 	const vehikel_besch_t *desc = NULL;
 	sint32 besch_index = -100000;
@@ -479,7 +479,7 @@ const vehikel_besch_t *vehikelbauer_t::get_best_matching( waytype_t wt, const ui
 			if(  desc==NULL  ||  difference<12    ) {
 				// then we want this vehicle!
 				desc = test_desc;
-				DBG_MESSAGE( "vehikelbauer_t::get_best_matching","Found car %s",desc->get_name());
+				DBG_MESSAGE( "vehicle_builder_t::get_best_matching","Found car %s",desc->get_name());
 			}
 		}
 		else {
@@ -502,13 +502,13 @@ const vehikel_besch_t *vehikelbauer_t::get_best_matching( waytype_t wt, const ui
 				// then we want this vehicle!
 				desc = test_desc;
 				besch_index = current_index;
-				DBG_MESSAGE( "vehikelbauer_t::get_best_matching","Found engine %s",desc->get_name());
+				DBG_MESSAGE( "vehicle_builder_t::get_best_matching","Found engine %s",desc->get_name());
 			}
 		}
 	}
 	// no vehicle found!
 	if(  desc==NULL  ) {
-		DBG_MESSAGE( "vehikelbauer_t::get_best_matching()","could not find a suitable vehicle! (speed %i, weight %i)",target_speed,target_weight);
+		DBG_MESSAGE( "vehicle_builder_t::get_best_matching()","could not find a suitable vehicle! (speed %i, weight %i)",target_speed,target_weight);
 	}
 	return desc;
 }

bauer/vehikelbauer.h

@@ -5,8 +5,8 @@
  * (see licence.txt)
  */
 
-#ifndef vehikelbauer_t_h
-#define vehikelbauer_t_h
+#ifndef vehicle_builder_t_h
+#define vehicle_builder_t_h
 
 
 #include "../dataobj/koord3d.h"
@@ -23,11 +23,11 @@ template <class T> class slist_tpl;
 
 /**
  * Baut Fahrzeuge. Fahrzeuge sollten nicht direct instanziiert werden
- * sondern immer von einem vehikelbauer_t erzeugt werden.
+ * sondern immer von einem vehicle_builder_t erzeugt werden.
  *
  * @author Hj. Malthaner
  */
-class vehikelbauer_t
+class vehicle_builder_t
 {
 public:
 	static bool speedbonus_init(const std::string &objfilename);

besch/reader/vehicle_reader.cc

@@ -15,7 +15,7 @@
 void vehicle_reader_t::register_obj(obj_desc_t *&data)
 {
 	vehikel_besch_t *desc = static_cast<vehikel_besch_t *>(data);
-	vehikelbauer_t::register_desc(desc);
+	vehicle_builder_t::register_desc(desc);
 	obj_for_xref(get_type(), desc->get_name(), data);
 
 	checksum_t *chk = new checksum_t();
@@ -26,7 +26,7 @@ void vehicle_reader_t::register_obj(obj_desc_t *&data)
 
 bool vehicle_reader_t::successfully_loaded() const
 {
-	return vehikelbauer_t::successfully_loaded();
+	return vehicle_builder_t::successfully_loaded();
 }
 
 

besch/vehikel_besch.h

@@ -44,7 +44,7 @@ class checksum_t;
  */
 class vehikel_besch_t : public obj_desc_transport_related_t {
     friend class vehicle_reader_t;
-    friend class vehikelbauer_t;
+    friend class vehicle_builder_t;
 
 public:
 	/**

gui/depot_frame.cc

@@ -1556,7 +1556,7 @@ void depot_frame_t::draw_vehicle_info_text(scr_coord pos)
 	if(  (sel_index != -1)  &&  (tabs.getroffen(x - pos.x, y - pos.y - D_TITLEBAR_HEIGHT))  ) {
 		// cursor over a vehicle in the selection list
 		const vector_tpl<gui_image_list_t::image_data_t*>& vec = (lst == &electrics ? electrics_vec : (lst == &pas ? pas_vec : (lst == &loks ? loks_vec : waggons_vec)));
-		veh_type = vehikelbauer_t::get_info( vec[sel_index]->text );
+		veh_type = vehicle_builder_t::get_info( vec[sel_index]->text );
 		if(  vec[sel_index]->lcolor == COL_RED  ||  veh_action == va_sell  ) {
 			// don't show new_vehicle_length_sb when can't actually add the highlighted vehicle, or selling from inventory
 			new_vehicle_length_sb_force_zero = true;

gui/schedule_list.cc

@@ -162,15 +162,15 @@ schedule_list_gui_t::schedule_list_gui_t(player_t *player_) :
 		tabs.add_tab(&scl, translator::translate("Narrowgauge"), skinverwaltung_t::narrowgaugehaltsymbol, translator::translate("Narrowgauge"));
 		tabs_to_lineindex[max_idx++] = simline_t::narrowgaugeline;
 	}
-	if(  !vehikelbauer_t::get_info(tram_wt).empty()  ) {
+	if(  !vehicle_builder_t::get_info(tram_wt).empty()  ) {
 		tabs.add_tab(&scl, translator::translate("Tram"), skinverwaltung_t::tramhaltsymbol, translator::translate("Tram"));
 		tabs_to_lineindex[max_idx++] = simline_t::tramline;
 	}
 	if(  strasse_t::default_strasse) {
 		tabs.add_tab(&scl, translator::translate("Truck"), skinverwaltung_t::autohaltsymbol, translator::translate("Truck"));
 		tabs_to_lineindex[max_idx++] = simline_t::truckline;
 	}
-	if(  !vehikelbauer_t::get_info(water_wt).empty()  ) {
+	if(  !vehicle_builder_t::get_info(water_wt).empty()  ) {
 		tabs.add_tab(&scl, translator::translate("Ship"), skinverwaltung_t::schiffshaltsymbol, translator::translate("Ship"));
 		tabs_to_lineindex[max_idx++] = simline_t::shipline;
 	}

player/ai.cc

@@ -492,7 +492,7 @@ bool ai_t::create_simple_road_transport(koord platz1, koord size1, koord platz2,
 	// is there already a connection?
 	// get a default vehikel
 	vehikel_besch_t test_desc(road_wt, 25, vehikel_besch_t::diesel );
-	vehicle_t* test_driver = vehikelbauer_t::build(welt->lookup_kartenboden(platz1)->get_pos(), this, NULL, &test_desc);
+	vehicle_t* test_driver = vehicle_builder_t::build(welt->lookup_kartenboden(platz1)->get_pos(), this, NULL, &test_desc);
 	test_driver->set_flag( obj_t::not_on_map );
 	route_t verbindung;
 	if(  verbindung.calc_route(welt, welt->lookup_kartenboden(platz1)->get_pos(), welt->lookup_kartenboden(platz2)->get_pos(), test_driver, 0, 0)  &&
@@ -580,5 +580,5 @@ void ai_t::rdwr(loadsave_t *file)
 const vehikel_besch_t *ai_t::vehikel_search(waytype_t typ, const uint32 target_power, const sint32 target_speed, const ware_besch_t * target_freight, bool include_electric)
 {
 	bool obsolete_allowed = welt->get_settings().get_allow_buying_obsolete_vehicles();
-	return vehikelbauer_t::vehikel_search(typ, welt->get_timeline_year_month(), target_power, target_speed, target_freight, include_electric, !obsolete_allowed);
+	return vehicle_builder_t::vehikel_search(typ, welt->get_timeline_year_month(), target_power, target_speed, target_freight, include_electric, !obsolete_allowed);
 }

player/ai.h

@@ -97,7 +97,7 @@ class ai_t : public player_t
 	// builds a round between those two places or returns false
 	bool create_simple_road_transport(koord platz1, koord size1, koord platz2, koord size2, const weg_besch_t *road );
 
-	/// helper method to call vehikelbauer_t::vehikel_search and fill in time-line related parameters
+	/// helper method to call vehicle_builder_t::vehikel_search and fill in time-line related parameters
 	static const vehikel_besch_t *vehikel_search(waytype_t typ, const uint32 target_power, const sint32 target_speed, const ware_besch_t * target_freight, bool include_electric);
 };
 

player/ai_goods.cc

@@ -428,15 +428,15 @@ bool ai_goods_t::create_ship_transport_vehikel(fabrik_t *qfab, int anz_vehikel)
 			// too many convois => cannot do anything about this ...
 			return i>0;
 		}
-		vehicle_t* v = vehikelbauer_t::build( qfab->get_pos(), this, NULL, ship_vehicle);
+		vehicle_t* v = vehicle_builder_t::build( qfab->get_pos(), this, NULL, ship_vehicle);
 		convoi_t* cnv = new convoi_t(this);
 		// V.Meyer: give the new convoi name from first vehicle
 		cnv->set_name(v->get_desc()->get_name());
 		cnv->add_vehikel( v );
 
 		// two part consist
 		if(v_second!=NULL) {
-			v = vehikelbauer_t::build( qfab->get_pos(), this, NULL, v_second );
+			v = vehicle_builder_t::build( qfab->get_pos(), this, NULL, v_second );
 			cnv->add_vehikel( v );
 		}
 
@@ -491,7 +491,7 @@ void ai_goods_t::create_road_transport_vehikel(fabrik_t *qfab, int anz_vehikel)
 				// too many convois => cannot do anything about this ...
 				return;
 			}
-			vehicle_t* v = vehikelbauer_t::build(startpos, this, NULL, road_vehicle);
+			vehicle_t* v = vehicle_builder_t::build(startpos, this, NULL, road_vehicle);
 			convoi_t* cnv = new convoi_t(this);
 			// V.Meyer: give the new convoi name from first vehicle
 			cnv->set_name(v->get_desc()->get_name());
@@ -532,7 +532,7 @@ void ai_goods_t::create_rail_transport_vehikel(const koord platz1, const koord p
 	}
 
 	koord3d start_pos = welt->lookup_kartenboden(pos1.get_2d() + (abs(size1.x)>abs(size1.y) ? koord(size1.x,0) : koord(0,size1.y)))->get_pos();
-	vehicle_t* v = vehikelbauer_t::build( start_pos, this, NULL, rail_engine);
+	vehicle_t* v = vehicle_builder_t::build( start_pos, this, NULL, rail_engine);
 
 	// V.Meyer: give the new convoi name from first vehicle
 	cnv->set_name(rail_engine->get_name());
@@ -545,7 +545,7 @@ void ai_goods_t::create_rail_transport_vehikel(const koord platz1, const koord p
 	 */
 	for(int i = 0; i < anz_vehikel; i++) {
 		// use the vehicle we searched before
-		vehicle_t* v = vehikelbauer_t::build(start_pos, this, NULL, rail_vehicle);
+		vehicle_t* v = vehicle_builder_t::build(start_pos, this, NULL, rail_vehicle);
 		cnv->add_vehikel( v );
 	}
 
@@ -1424,13 +1424,13 @@ void ai_goods_t::rdwr(loadsave_t *file)
 		freight = temp ? warenbauer_t::get_info(temp) : NULL;
 		// vehicles
 		file->rdwr_str( temp );
-		rail_engine = temp ? vehikelbauer_t::get_info(temp) : NULL;
+		rail_engine = temp ? vehicle_builder_t::get_info(temp) : NULL;
 		file->rdwr_str( temp );
-		rail_vehicle = temp ? vehikelbauer_t::get_info(temp) : NULL;
+		rail_vehicle = temp ? vehicle_builder_t::get_info(temp) : NULL;
 		file->rdwr_str( temp );
-		road_vehicle = temp ? vehikelbauer_t::get_info(temp) : NULL;
+		road_vehicle = temp ? vehicle_builder_t::get_info(temp) : NULL;
 		file->rdwr_str( temp );
-		ship_vehicle = temp ? vehikelbauer_t::get_info(temp) : NULL;
+		ship_vehicle = temp ? vehicle_builder_t::get_info(temp) : NULL;
 		// ways
 		file->rdwr_str( temp );
 		rail_weg = temp ? wegbauer_t::get_desc(temp,0) : NULL;