From f6e8763456699488d64e3d49a5b76a70eaa49836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=28=C2=B4=E3=83=BB=CF=89=E3=83=BB=EF=BD=80=29?= Date: Sat, 29 Jan 2022 17:46:24 +0900 Subject: [PATCH] Translate German into English based on extended --- bauer/fabrikbauer.cc | 10 +++++----- bauer/tree_builder.cc | 2 +- boden/grund.h | 2 +- obj/baum.cc | 18 +++++++++--------- obj/baum.h | 2 +- simcity.cc | 2 +- simfab.cc | 18 +++++++++--------- simfab.h | 16 ++++++++-------- simtool.cc | 8 ++++---- simworld.cc | 4 ++-- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bauer/fabrikbauer.cc b/bauer/fabrikbauer.cc index d22bef28a2..c465e234ad 100644 --- a/bauer/fabrikbauer.cc +++ b/bauer/fabrikbauer.cc @@ -498,7 +498,7 @@ fabrik_t* factory_builder_t::build_factory(koord3d* parent, const factory_desc_t add_factory_to_fab_map(welt, fab); if(parent) { - fab->add_lieferziel(parent->get_2d()); + fab->add_consumer(parent->get_2d()); } // make all water station @@ -777,7 +777,7 @@ int factory_builder_t::build_chain_link(const fabrik_t* our_fab, const factory_d break; // connect to an existing one if this is a producer - if( fab->vorrat_an(ware) > -1 ) { + if( fab->count_output_stock(ware) > -1 ) { const int distance = koord_distance(fab->get_pos(),our_fab->get_pos()); if( distance > welt->get_settings().get_min_factory_spacing() && distance <= DISTANCE ) { @@ -806,7 +806,7 @@ int factory_builder_t::build_chain_link(const fabrik_t* our_fab, const factory_d if (production_left > 0 || simrand(100) < (uint32)welt->get_settings().get_crossconnect_factor()) { if(production_left>0) { consumption -= production_left; - fab->add_lieferziel(our_fab->get_pos().get_2d()); + fab->add_consumer(our_fab->get_pos().get_2d()); DBG_MESSAGE("factory_builder_t::build_chain_link","supplier %s can supply approx %i of %s to us", fd->get_name(), production_left, ware->get_name()); } else { @@ -920,7 +920,7 @@ int factory_builder_t::build_chain_link(const fabrik_t* our_fab, const factory_d // now we add us to all cross-connected factories FOR(slist_tpl, const i, crossconnected_supplier) { - i->add_lieferziel(our_fab->get_pos().get_2d()); + i->add_consumer(our_fab->get_pos().get_2d()); } /* now the cross-connect part: @@ -929,7 +929,7 @@ int factory_builder_t::build_chain_link(const fabrik_t* our_fab, const factory_d FOR(slist_tpl, const fab, new_factories) { for (slist_tpl::iterator i = factories_to_correct.begin(), end = factories_to_correct.end(); i != end;) { i->demand -= 1; - fab->add_lieferziel(i->fab->get_pos().get_2d()); + fab->add_consumer(i->fab->get_pos().get_2d()); i->fab->add_supplier(fab->get_pos().get_2d()); if (i->demand < 0) { i = factories_to_correct.erase(i); diff --git a/bauer/tree_builder.cc b/bauer/tree_builder.cc index 6ad6262e29..07ff90834b 100644 --- a/bauer/tree_builder.cc +++ b/bauer/tree_builder.cc @@ -123,7 +123,7 @@ bool tree_builder_t::plant_tree_on_coordinate(koord pos, const tree_desc_t *desc baum_t *b = new baum_t(gr->get_pos(), desc); //plants the tree if( random_age ) { - b->geburt = welt->get_current_month() - simrand(baum_t::AGE_LIMIT-1); + b->purchase_time = welt->get_current_month() - simrand(baum_t::AGE_LIMIT-1); b->calc_off( welt->lookup( b->get_pos() )->get_grund_hang() ); } diff --git a/boden/grund.h b/boden/grund.h index 3d5dbd9601..fa818ed96d 100644 --- a/boden/grund.h +++ b/boden/grund.h @@ -95,7 +95,7 @@ class grund_t * Flag values for different ground properties */ enum flag_values { - keine_flags = 0, + no_flags = 0, dirty = 1 << 0, ///< was changed => redraw full is_kartenboden = 1 << 1, has_text = 1 << 2, diff --git a/obj/baum.cc b/obj/baum.cc index 1617853372..956e31045b 100644 --- a/obj/baum.cc +++ b/obj/baum.cc @@ -31,7 +31,7 @@ FLAGGED_PIXVAL baum_t::outline_color = 0; baum_t::baum_t(loadsave_t *file) : obj_t(), - geburt(welt->get_current_month()), + purchase_time(welt->get_current_month()), tree_id(0), season(0) { @@ -41,7 +41,7 @@ baum_t::baum_t(loadsave_t *file) : baum_t::baum_t(koord3d pos) : obj_t(pos), - geburt(welt->get_current_month() - simrand(baum_t::AGE_LIMIT-1)), // generate aged trees, might underflow + purchase_time(welt->get_current_month() - simrand(baum_t::AGE_LIMIT-1)), // generate aged trees, might underflow season(0) { tree_id = (uint8)tree_builder_t::random_tree_id_for_climate( welt->get_climate( pos.get_2d() ) ); @@ -53,7 +53,7 @@ baum_t::baum_t(koord3d pos) : baum_t::baum_t(koord3d pos, uint8 type, uint16 age, slope_t::type slope ) : obj_t(pos), - geburt(welt->get_current_month() - age), // might underflow + purchase_time(welt->get_current_month() - age), // might underflow tree_id(type), season(0) { @@ -64,7 +64,7 @@ baum_t::baum_t(koord3d pos, uint8 type, uint16 age, slope_t::type slope ) : baum_t::baum_t(koord3d pos, const tree_desc_t *desc) : obj_t(pos), - geburt(welt->get_current_month()), + purchase_time(welt->get_current_month()), tree_id(tree_builder_t::get_id_by_desc(desc)), season(0) { @@ -85,7 +85,7 @@ void baum_t::rdwr(loadsave_t *file) // after loading, calculate anew age &= 0xFFF << 18; - geburt = welt->get_current_month() - (age>>18); + purchase_time = welt->get_current_month() - (age>>18); if(file->is_loading()) { char buf[128]; @@ -210,7 +210,7 @@ bool baum_t::check_season(const bool) } // we make the tree four months older to avoid second spawning - geburt -= baum_t::SPAWN_PERIOD_LENGTH; + purchase_time -= baum_t::SPAWN_PERIOD_LENGTH; } // tree will die after 704 months (i.e. 58 years 8 months) @@ -261,11 +261,11 @@ void baum_t::recalc_off() // takes care of slopes void baum_t::calc_off(slope_t::type slope, sint8 x_, sint8 y_) { - const sint16 random = (sint16)( get_pos().x + get_pos().y + get_pos().z + slope + tree_id + geburt ); + const sint16 random = (sint16)( get_pos().x + get_pos().y + get_pos().z + slope + tree_id + purchase_time ); // point on tile (imaginary origin at sw corner, x axis: north, y axis: east sint16 x = x_==-128 ? (random + tree_id) & 31 : x_; - sint16 y = y_==-128 ? (random + geburt) & 31 : y_; + sint16 y = y_==-128 ? (random + purchase_time) & 31 : y_; // the last bit has to be the same y ^= x&1; @@ -321,7 +321,7 @@ void baum_t::cleanup(player_t *player) uint16 baum_t::get_age() const { - return (welt->get_current_month() - (uint32)geburt) % (1<<12); + return (welt->get_current_month() - (uint32)purchase_time) % (1<<12); } diff --git a/obj/baum.h b/obj/baum.h index dcbfe19e1b..b1cf04f755 100644 --- a/obj/baum.h +++ b/obj/baum.h @@ -36,7 +36,7 @@ class baum_t : public obj_t static FLAGGED_PIXVAL outline_color; /// month of birth - uint16 geburt; + uint16 purchase_time; /// type of tree (was 9 but for more compact saves now only 254 different tree types are allowed) uint8 tree_id; diff --git a/simcity.cc b/simcity.cc index 74dab94ebf..712b6e16e1 100644 --- a/simcity.cc +++ b/simcity.cc @@ -1726,7 +1726,7 @@ void stadt_t::calc_growth() for( int i=0; iget_supplier_count(); i++ ) { city_history_month[0][HIST_GOODS_NEEDED] ++; city_history_year[0][HIST_GOODS_NEEDED] ++; - if( fab->input_vorrat_an( desc->get_supplier(i)->get_input_type() )>0 ) { + if( fab->count_input_stock( desc->get_supplier(i)->get_input_type() )>0 ) { city_history_month[0][HIST_GOODS_RECEIVED] ++; city_history_year[0][HIST_GOODS_RECEIVED] ++; } diff --git a/simfab.cc b/simfab.cc index 961195c881..1b73fae98c 100644 --- a/simfab.cc +++ b/simfab.cc @@ -723,7 +723,7 @@ bool fabrik_t::is_within_players_network( const player_t* player ) const -void fabrik_t::add_lieferziel(koord ziel) +void fabrik_t::add_consumer(koord ziel) { if( !lieferziele.is_contained(ziel) ) { lieferziele.insert_ordered( ziel, RelativeDistanceOrdering(pos.get_2d()) ); @@ -736,7 +736,7 @@ void fabrik_t::add_lieferziel(koord ziel) } -void fabrik_t::rem_lieferziel(koord ziel) +void fabrik_t::remove_consumer(koord ziel) { lieferziele.remove(ziel); } @@ -1713,7 +1713,7 @@ sint64 fabrik_t::get_power() const } -sint32 fabrik_t::input_vorrat_an(const goods_desc_t *typ) +sint32 fabrik_t::count_input_stock(const goods_desc_t *typ) { sint32 menge = -1; @@ -1728,7 +1728,7 @@ sint32 fabrik_t::input_vorrat_an(const goods_desc_t *typ) } -sint32 fabrik_t::vorrat_an(const goods_desc_t *typ) +sint32 fabrik_t::count_output_stock(const goods_desc_t *typ) { sint32 menge = -1; @@ -3177,7 +3177,7 @@ void fabrik_t::add_supplier(koord ziel) } -void fabrik_t::rem_supplier(koord pos) +void fabrik_t::remove_supplier(koord pos) { suppliers.remove(pos); @@ -3231,10 +3231,10 @@ void fabrik_t::add_all_suppliers() FOR(slist_tpl, const fab, welt->get_fab_list()) { // connect to an existing one, if this is an producer - if(fab!=this && fab->vorrat_an(ware) > -1) { + if(fab!=this && fab->count_output_stock(ware) > -1) { // add us to this factory // will also add to our suppliers list - fab->add_lieferziel(pos.get_2d()); + fab->add_consumer(pos.get_2d()); } } } @@ -3251,9 +3251,9 @@ bool fabrik_t::add_supplier(fabrik_t* fab) const goods_desc_t *ware = supplier->get_input_type(); // connect to an existing one, if this is an producer - if( fab!=this && fab->vorrat_an(ware) > -1 ) { + if( fab!=this && fab->count_output_stock(ware) > -1 ) { // add us to this factory - fab->add_lieferziel(pos.get_2d()); + fab->add_consumer(pos.get_2d()); return true; } } diff --git a/simfab.h b/simfab.h index 369bbd5eeb..3045d1ea23 100644 --- a/simfab.h +++ b/simfab.h @@ -547,22 +547,22 @@ class fabrik_t void clear_target_cities(); const vector_tpl& get_target_cities() const { return target_cities; } - void add_lieferziel(koord ziel); - void rem_lieferziel(koord pos); + void add_consumer(koord ziel); + void remove_consumer(koord pos); /** * adds a supplier */ void add_supplier(koord pos); - void rem_supplier(koord pos); + void remove_supplier(koord pos); /** - * @return menge der ware typ - * -1 wenn typ nicht produziert wird - * sonst die gelagerte menge + * @return quantity of the goods type + * if not type is produced + * otherwise the stored quantity */ - sint32 input_vorrat_an(const goods_desc_t *ware); // Vorrat von Warentyp - sint32 vorrat_an(const goods_desc_t *ware); // Vorrat von Warentyp + sint32 count_input_stock(const goods_desc_t *ware); + sint32 count_output_stock(const goods_desc_t *ware); // true, if there was production requiring power in the last step bool is_currently_producing() const { return currently_requiring_power; } diff --git a/simtool.cc b/simtool.cc index 3b5f7ab693..e38e79ef94 100644 --- a/simtool.cc +++ b/simtool.cc @@ -5905,10 +5905,10 @@ const char *tool_link_factory_t::do_work( player_t *, const koord3d &start, cons } else { // remove connections - fab->rem_supplier(last_fab->get_pos().get_2d()); - fab->rem_lieferziel(last_fab->get_pos().get_2d()); - last_fab->rem_supplier(fab->get_pos().get_2d()); - last_fab->rem_lieferziel(fab->get_pos().get_2d()); + fab->remove_supplier(last_fab->get_pos().get_2d()); + fab->remove_consumer(last_fab->get_pos().get_2d()); + last_fab->remove_supplier(fab->get_pos().get_2d()); + last_fab->remove_consumer(fab->get_pos().get_2d()); return NULL; } } diff --git a/simworld.cc b/simworld.cc index fa4df64455..216f647cd2 100644 --- a/simworld.cc +++ b/simworld.cc @@ -3478,8 +3478,8 @@ bool karte_t::rem_fab(fabrik_t *fab) // remove all links from factories FOR(slist_tpl, const fab, fab_list) { - fab->rem_lieferziel(k); - fab->rem_supplier(k); + fab->remove_consumer(k); + fab->remove_supplier(k); } // remove all links to cities