Skip to content

Commit

Permalink
(ceeac) remove obsolete comments
Browse files Browse the repository at this point in the history
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@8951 8aca7d54-2c30-db11-9de9-000461428c89
  • Loading branch information
prissi committed Mar 8, 2020
1 parent f35c8ec commit 17eae52
Show file tree
Hide file tree
Showing 439 changed files with 851 additions and 3,218 deletions.
2 changes: 1 addition & 1 deletion bauer/brueckenbauer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ const char *bridge_builder_t::remove(player_t *player, koord3d pos_start, waytyp
do {
pos = tmp_list.remove_first();

// V.Meyer: weg_position_t changed to grund_t::get_neighbour()
// weg_position_t changed to grund_t::get_neighbour()
grund_t *from = welt->lookup(pos);
grund_t *to;
koord zv = koord::invalid;
Expand Down
2 changes: 1 addition & 1 deletion bauer/brueckenbauer.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class bridge_desc_t;
class grund_t;
class karte_ptr_t;
class player_t; // Hajo: 22-Nov-01: Added forward declaration
class player_t;
class way_desc_t;
class tool_selector_t;

Expand Down
2 changes: 1 addition & 1 deletion bauer/fabrikbauer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ int factory_builder_t::build_chain_link(const fabrik_t* our_fab, const factory_d

DBG_MESSAGE("factory_builder_t::build_chain_link","supplier_count %i, lcount %i (need %i of %s)",info->get_supplier_count(),lcount,consumption,ware->get_name());

// Hajo: search if there already is one or two (cross-connect everything if possible)
// search if there already is one or two (cross-connect everything if possible)
FOR(slist_tpl<fabrik_t*>, const fab, welt->get_fab_list()) {
// Try to find matching factories for this consumption, but don't find more than two times number of factories requested.
if ((lcount != 0 || consumption <= 0) && lcount < lfound + 1) break;
Expand Down
5 changes: 1 addition & 4 deletions bauer/goods_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ bool goods_manager_t::successfully_loaded()
return false;
}

/**
* Put special items in front:
* Volker Meyer
*/
// Put special items in front
goods.insert_at(0,load_none);
goods.insert_at(0,load_mail);
goods.insert_at(0,load_passengers);
Expand Down
3 changes: 0 additions & 3 deletions bauer/goods_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ class goods_desc_t;

/**
* Factory-Class for Goods.
*
* @author Hj. Malthaner
*/
class goods_manager_t
{
Expand Down Expand Up @@ -47,7 +45,6 @@ class goods_manager_t
* unknown.
*
* @param name the non-translated good name
* @author Hj. Malthaner/V. Meyer
*/
static const goods_desc_t *get_info(const char* name);

Expand Down
2 changes: 1 addition & 1 deletion bauer/hausbauer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ gebaeude_t* hausbauer_t::build(player_t* player, koord3d pos, int org_layout, co
}
// try to fake old building
else if(welt->get_ticks() < 2) {
// Hajo: after staring a new map, build fake old buildings
// after staring a new map, build fake old buildings
gb->add_alter(10000);
}

Expand Down
3 changes: 0 additions & 3 deletions bauer/tunnelbauer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ const tunnel_desc_t *tunnel_builder_t::get_desc(const char *name)

/**
* Find a matching tunnel
* @author Hj. Malthaner
*/
const tunnel_desc_t *tunnel_builder_t::get_tunnel_desc(const waytype_t wtyp, const sint32 min_speed, const uint16 time)
{
Expand Down Expand Up @@ -106,7 +105,6 @@ static bool compare_tunnels(const tunnel_desc_t* a, const tunnel_desc_t* b)

/**
* Fill menu with icons of given waytype
* @author Hj. Malthaner
*/
void tunnel_builder_t::fill_menu(tool_selector_t* tool_selector, const waytype_t wtyp, sint16 /*sound_ok*/)
{
Expand Down Expand Up @@ -658,7 +656,6 @@ const char *tunnel_builder_t::remove(player_t *player, koord3d start, waytype_t
do {
pos = tmp_list.remove_first();

// V.Meyer: weg_position_t changed to grund_t::get_neighbour()
grund_t *from = welt->lookup(pos);
grund_t *to;
koord zv = koord::invalid;
Expand Down
4 changes: 1 addition & 3 deletions bauer/tunnelbauer.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "../dataobj/koord3d.h"

class karte_ptr_t;
class player_t; // Hajo: 22-Nov-01: Added forward declaration
class player_t;
class tunnel_desc_t;
class way_desc_t;
class tool_selector_t;
Expand All @@ -21,8 +21,6 @@ class tool_selector_t;
* sondern immer vom tunnel_builder_t erzeugt werden.
*
* Es gibt keine Instanz - nur statische Methoden.
*
* @author V. Meyer
*/
class tunnel_builder_t {
private:
Expand Down
8 changes: 4 additions & 4 deletions bauer/vehikelbauer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,10 @@ slist_tpl<vehicle_desc_t const*> const & vehicle_builder_t::get_info(waytype_t c
}


/* extended search for vehicles for KI *
/**
* extended search for vehicles for AI
* checks also timeline and constraints
* tries to get best with but adds a little random action
* @author prissi
*/
const vehicle_desc_t *vehicle_builder_t::vehikel_search( waytype_t wt, const uint16 month_now, const uint32 target_weight, const sint32 target_speed, const goods_desc_t * target_freight, bool include_electric, bool not_obsolete )
{
Expand Down Expand Up @@ -499,10 +499,10 @@ const vehicle_desc_t *vehicle_builder_t::vehikel_search( waytype_t wt, const uin



/* extended search for vehicles for replacement on load time
/**
* extended search for vehicles for replacement on load time
* tries to get best match (no random action)
* if prev_desc==NULL, then the convoi must be able to lead a convoi
* @author prissi
*/
const vehicle_desc_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 goods_desc_t * target_freight, bool not_obsolete, const vehicle_desc_t *prev_veh, bool is_last )
{
Expand Down
5 changes: 1 addition & 4 deletions bauer/vehikelbauer.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ template <class T> class slist_tpl;
/**
* Baut Fahrzeuge. Fahrzeuge sollten nicht direct instanziiert werden
* sondern immer von einem vehicle_builder_t erzeugt werden.
*
* @author Hj. Malthaner
*/
class vehicle_builder_t
{
Expand Down Expand Up @@ -62,8 +60,7 @@ class vehicle_builder_t
static const vehicle_desc_t * get_info(const char *name);
static slist_tpl<vehicle_desc_t const*> const& get_info(waytype_t, uint8 sortkey = vehicle_builder_t::sb_name);

/* extended search for vehicles for KI
* @author prissi
/** extended search for vehicles for AI
*/
static const vehicle_desc_t *vehikel_search(waytype_t typ,const uint16 month_now,const uint32 target_power,const sint32 target_speed, const goods_desc_t * target_freight, bool include_electric, bool not_obsolete );

Expand Down
25 changes: 9 additions & 16 deletions bauer/wegbauer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ const vector_tpl<const way_desc_t *>& way_builder_t::get_way_list(const waytype
* - the slowest way, as fast as speed limit
* - if no way faster than speed limit, the fastest way.
* The timeline is also respected.
* @author prissi, gerw
*/
const way_desc_t* way_builder_t::weg_search(const waytype_t wtyp, const sint32 speed_limit, const uint16 time, const systemtype_t system_type)
{
Expand Down Expand Up @@ -289,7 +288,6 @@ static bool compare_ways(const way_desc_t* a, const way_desc_t* b)

/**
* Fill menu with icons of given waytype, return number of added entries
* @author Hj. Malthaner/prissi/dariok
*/
void way_builder_t::fill_menu(tool_selector_t *tool_selector, const waytype_t wtyp, const systemtype_t styp, sint16 /*ok_sound*/)
{
Expand Down Expand Up @@ -319,8 +317,7 @@ void way_builder_t::fill_menu(tool_selector_t *tool_selector, const waytype_t wt
}


/* allow for railroad crossing
* @author prissi
/** allow for railroad crossing
*/
bool way_builder_t::check_crossing(const koord zv, const grund_t *bd, waytype_t wtyp0, const player_t *player) const
{
Expand Down Expand Up @@ -384,8 +381,7 @@ bool way_builder_t::check_crossing(const koord zv, const grund_t *bd, waytype_t
}


/* crossing of powerlines, or no powerline
* @author prissi
/** crossing of powerlines, or no powerline
*/
bool way_builder_t::check_powerline(const koord zv, const grund_t *bd) const
{
Expand Down Expand Up @@ -495,11 +491,10 @@ bool way_builder_t::check_building( const grund_t *to, const koord dir ) const
}


/* This is the core routine for the way search
/** This is the core routine for the way search
* it will check
* A) allowed step
* B) if allowed, calculate the cost for the step from from to to
* @author prissi
*/
bool way_builder_t::is_allowed_step(const grund_t *from, const grund_t *to, sint32 *costs, bool is_upperlayer ) const
{
Expand Down Expand Up @@ -845,7 +840,7 @@ bool way_builder_t::is_allowed_step(const grund_t *from, const grund_t *to, sint
}
break;

case luft: // hsiegeln: runway
case luft: // runway
{
const weg_t *w = to->get_weg(air_wt);
if( w && w->get_desc()->get_styp()==type_runway && desc->get_styp()!=type_runway && ribi_t::is_single(w->get_ribi_unmasked()) ) {
Expand Down Expand Up @@ -1171,7 +1166,6 @@ way_builder_t::way_builder_t(player_t* player) : next_gr(32)
/**
* If a way is built on top of another way, should the type
* of the former way be kept or replaced (true == keep)
* @author Hj. Malthaner
*/
void way_builder_t::set_keep_existing_ways(bool yesno)
{
Expand Down Expand Up @@ -2312,7 +2306,6 @@ void way_builder_t::build_tunnel_and_bridges()

/*
* returns the amount needed to built this way
* author prissi
*/
sint64 way_builder_t::calc_costs()
{
Expand Down Expand Up @@ -2587,7 +2580,7 @@ void way_builder_t::build_road()
if(extend) {
weg_t * weg = gr->get_weg(road_wt);

// keep faster ways or if it is the same way ... (@author prissi)
// keep faster ways or if it is the same way
if(weg->get_desc()==desc || keep_existing_ways || (keep_existing_city_roads && weg->hat_gehweg()) || (keep_existing_faster_ways && weg->get_desc()->get_topspeed()>desc->get_topspeed()) || (player_builder!=NULL && weg->is_deletable(player_builder)!=NULL) || (gr->get_typ()==grund_t::monorailboden && (bautyp&elevated_flag)==0)) {
//nothing to be done
//DBG_MESSAGE("way_builder_t::build_road()","nothing to do at (%i,%i)",k.x,k.y);
Expand Down Expand Up @@ -2619,7 +2612,7 @@ void way_builder_t::build_road()
str->set_gehweg(add_sidewalk);
cost = -gr->neuen_weg_bauen(str, route.get_short_ribi(i), player_builder)-desc->get_price();

// prissi: into UNDO-list, so we can remove it later
// into UNDO-list, so we can remove it later
if(player_builder!=NULL) {
// intercity roads have no owner, so we must check for an owner
player_builder->add_undo( route[i] );
Expand Down Expand Up @@ -2661,7 +2654,7 @@ void way_builder_t::build_track()
bool change_desc = true;

// do not touch fences, tram way etc. if there is already same way with different type
// keep faster ways or if it is the same way ... (@author prissi)
// keep faster ways or if it is the same way
if (weg->get_desc() == desc ||
(desc->get_styp() == 0 && weg->get_desc()->get_styp() == type_tram && gr->has_two_ways()) ||
keep_existing_ways ||
Expand Down Expand Up @@ -2729,7 +2722,7 @@ void way_builder_t::build_track()
}
}

// prissi: into UNDO-list, so we can remove it later
// into UNDO-list, so we can remove it later
player_builder->add_undo( route[i] );
}

Expand Down Expand Up @@ -2770,7 +2763,7 @@ void way_builder_t::build_powerline()
lt = new leitung_t(route[i], player_builder );
gr->obj_add(lt);

// prissi: into UNDO-list, so we can remove it later
// into UNDO-list, so we can remove it later
player_builder->add_undo( route[i] );
build_powerline = true;
}
Expand Down
22 changes: 6 additions & 16 deletions bauer/wegbauer.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class tool_selector_t;

/**
* way building class with its own route finding
* @author Hj. Malthaner
*/
class way_builder_t
{
Expand All @@ -38,7 +37,6 @@ class way_builder_t

/**
* Finds a way with a given speed limit for a given waytype
* @author prissi
*/
static const way_desc_t *weg_search(const waytype_t wtyp,const sint32 speed_limit, const uint16 time, const systemtype_t system_type);

Expand All @@ -55,7 +53,6 @@ class way_builder_t

/**
* Fill menu with icons of given waytype
* @author Hj. Malthaner
*/
static void fill_menu(tool_selector_t *tool_selector, const waytype_t wtyp, const systemtype_t styp, sint16 ok_sound);

Expand Down Expand Up @@ -101,32 +98,27 @@ class way_builder_t

/**
* Type of building operation
* @author Hj. Malthaner
*/
bautyp_t bautyp;

/**
* Type of way to build
* @author Hj. Malthaner
*/
const way_desc_t * desc;

/**
* Type of bridges to build (zero=>no bridges)
* @author Hj. Malthaner
*/
const bridge_desc_t * bridge_desc;

/**
* Type of tunnels to build (zero=>no bridges)
* @author Hj. Malthaner
*/
const tunnel_desc_t * tunnel_desc;

/**
* If a way is built on top of another way, should the type
* of the former way be kept or replaced (true == keep)
* @author Hj. Malthaner
*/
bool keep_existing_ways;
bool keep_existing_faster_ways;
Expand All @@ -141,11 +133,11 @@ class way_builder_t
vector_tpl<uint32> terraform_index;

public:
/* This is the core routine for the way search
/**
* This is the core routine for the way search
* it will check
* A) allowed step
* B) if allowed, calculate the cost for the step from from to to
* @author prissi
*/
bool is_allowed_step(const grund_t *from, const grund_t *to, sint32 *costs, bool is_upperlayer = false ) const;

Expand Down Expand Up @@ -185,18 +177,17 @@ class way_builder_t
/**
* If a way is built on top of another way, should the type
* of the former way be kept or replaced (true == keep)
* @author Hj. Malthaner
*/
void set_keep_existing_ways(bool yesno);

/* If a way is built on top of another way, should the type
/**
* If a way is built on top of another way, should the type
* of the former way be kept or replaced, if the current way is faster (true == keep)
* @author Hj. Malthaner
*/
void set_keep_existing_faster_ways(bool yesno);

/* Always keep city roads (for AI)
* @author prissi
/**
* Always keep city roads (for AI)
*/
void set_keep_city_roads(bool yesno) { keep_existing_city_roads = yesno; }

Expand All @@ -213,7 +204,6 @@ class way_builder_t
void calc_route(const vector_tpl<koord3d> &start3d, const vector_tpl<koord3d> &ziel);

/* returns the amount needed to built this way
* author prissi
*/
sint64 calc_costs();

Expand Down
6 changes: 0 additions & 6 deletions boden/boden.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
* (see LICENSE.txt)
*/

/*
* Nature/Countryside ground for Simutrans.
* Revised January 2001
* Hj. Malthaner
*/

#include "../simworld.h"
#include "../simskin.h"

Expand Down
3 changes: 0 additions & 3 deletions boden/boden.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@

/**
* boden_t are nature tiles (maybe with ways, powerlines, trees and beware: harbor buildings)
*
* @author Hj. Malthaner
*/

class boden_t : public grund_t
{
protected:
Expand Down
Loading

0 comments on commit 17eae52

Please sign in to comment.