Index: bauer/fabrikbauer.cc =================================================================== --- bauer/fabrikbauer.cc (revision 8092) +++ bauer/fabrikbauer.cc (working copy) @@ -109,26 +109,26 @@ * Searches for a suitable building site using suche_platz(). * The site is chosen so that there is a street next to the building site. */ -class factory_bauplatz_mit_strasse_sucher_t: public bauplatz_sucher_t { +class factory_place_with_road_searcher: public building_place_searcher_t { public: - factory_bauplatz_mit_strasse_sucher_t(karte_t* welt) : bauplatz_sucher_t(welt) {} + factory_place_with_road_searcher(karte_t* welt) : building_place_searcher_t(welt) {} - virtual bool ist_platz_ok(koord pos, sint16 b, sint16 h, climate_bits cl) const + virtual bool is_place_ok(koord pos, sint16 w, sint16 h, climate_bits cl) const { - if( !bauplatz_sucher_t::ist_platz_ok(pos, b, h, cl) ) { + if( !building_place_searcher_t::is_place_ok(pos, w, h, cl) ) { return false; } bool next_to_road = false; for (sint16 y = -1; y < h; y++) { - for (sint16 x = -1; x < b; x++) { + for (sint16 x = -1; x < w; x++) { koord k(pos + koord(x,y)); grund_t *gr = welt->lookup_kartenboden(k); if (!gr) { return false; } - if ( 0 <= x && x < b-1 && 0 <= y && y < h-1) { + if ( 0 <= x && x < w-1 && 0 <= y && y < h-1) { // not at border: is there something top like elevated monorails? if( gr->get_leitung()!=NULL || welt->lookup(gr->get_pos()+koord3d(0,0,1) )!=NULL) { // something on top (monorail or power lines) @@ -138,7 +138,7 @@ } else { // border but not corner: near a road if possible - if (!next_to_road && (0 <= x || x < b-1) && (0 <= y || y < h-1)) { + if (!next_to_road && (0 <= x || x < w-1) && (0 <= y || y < h-1)) { next_to_road = gr->hat_weg(road_wt); } // do not build on an existing factory @@ -591,12 +591,12 @@ */ bool is_rotate=info->get_building()->get_all_layouts()>1 && size.x!=size.y && info->get_building()->can_rotate(); // first try with standard orientation - koord k = factory_bauplatz_mit_strasse_sucher_t(welt).suche_platz(city->get_pos(), size.x, size.y, info->get_building()->get_allowed_climate_bits()); + koord k = factory_place_with_road_searcher(welt).search_place(city->get_pos(), size.x, size.y, info->get_building()->get_allowed_climate_bits()); // second try: rotated koord k1 = koord::invalid; if (is_rotate && (k == koord::invalid || simrand(256)<128)) { - k1 = factory_bauplatz_mit_strasse_sucher_t(welt).suche_platz(city->get_pos(), size.y, size.x, info->get_building()->get_allowed_climate_bits()); + k1 = factory_place_with_road_searcher(welt).search_place(city->get_pos(), size.y, size.x, info->get_building()->get_allowed_climate_bits()); } rotate = simrand( info->get_building()->get_all_layouts() ); @@ -629,7 +629,7 @@ * often hidden behind a row of houses, cut off from roads. */ #if 0 - k = bauplatz_sucher_t(welt).suche_platz(city->get_pos(), land_bau.dim.x, land_bau.dim.y, info->get_building()->get_allowed_climate_bits(), &is_rotate); + k = building_place_searcher_t(welt).search_place(city->get_pos(), land_bau.dim.x, land_bau.dim.y, info->get_building()->get_allowed_climate_bits(), &is_rotate); #endif if(k != koord::invalid) { Index: player/ai.cc =================================================================== --- player/ai.cc (revision 8093) +++ player/ai.cc (working copy) @@ -37,19 +37,19 @@ /* The flesh for the place with road for headquarters searcher ... */ -bool ai_bauplatz_mit_strasse_sucher_t::strasse_bei(sint16 x, sint16 y) const { +bool ai_building_place_with_road_searcher::road_by(sint16 x, sint16 y) const { grund_t *bd = welt->lookup_kartenboden( koord(x,y) ); return bd && bd->hat_weg(road_wt); } -bool ai_bauplatz_mit_strasse_sucher_t::ist_platz_ok(koord pos, sint16 b, sint16 h, climate_bits cl) const { - if(bauplatz_sucher_t::ist_platz_ok(pos, b, h, cl)) { +bool ai_building_place_with_road_searcher::is_place_ok(koord pos, sint16 w, sint16 h, climate_bits cl) const { + if(building_place_searcher_t::is_place_ok(pos, w, h, cl)) { // check to not built on a road int i, j; - for(j=pos.x; jget_all_layouts()>1; - place = ai_bauplatz_mit_strasse_sucher_t(welt).suche_platz(st->get_pos(), desc->get_x(), desc->get_y(), desc->get_allowed_climate_bits(), &is_rotate); + place = ai_building_place_with_road_searcher(welt).search_place(st->get_pos(), desc->get_x(), desc->get_y(), desc->get_allowed_climate_bits(), &is_rotate); } } const char *err="No suitable ground!"; Index: player/ai.h =================================================================== --- player/ai.h (revision 8093) +++ player/ai.h (working copy) @@ -21,15 +21,15 @@ /** * bauplatz_mit_strasse_sucher_t: * - * Search for a free location using the function suche_platz(). + * Search for a free location using the function search_place(). * * @author V. Meyer */ -class ai_bauplatz_mit_strasse_sucher_t : public bauplatz_sucher_t { +class ai_building_place_with_road_searcher : public building_place_searcher_t { public: - ai_bauplatz_mit_strasse_sucher_t(karte_t *welt) : bauplatz_sucher_t(welt) {} - bool strasse_bei(sint16 x, sint16 y) const; - virtual bool ist_platz_ok(koord pos, sint16 b, sint16 h, climate_bits cl) const; + ai_building_place_with_road_searcher(karte_t *welt) : building_place_searcher_t(welt) {} + bool road_by(sint16 x, sint16 y) const; + virtual bool is_place_ok(koord pos, sint16 w, sint16 h, climate_bits cl) const; }; Index: simcity.cc =================================================================== --- simcity.cc (revision 8092) +++ simcity.cc (working copy) @@ -491,10 +491,10 @@ } /** - * monument_platz_sucher_t: + * monument_place_searcher_t: * - * Search a free place for a building - * Im Gegensatz zum bauplatz_sucher_t werden Strassen auf den Raendern + * Search a free place for a monument building + * Im Gegensatz zum building_place_searcher_t werden Strassen auf den Raendern * toleriert. * * 22-Dec-02: Hajo: added safety checks for gr != 0 and plan != 0 @@ -501,11 +501,11 @@ * * @author V. Meyer */ -class monument_platz_sucher_t : public platzsucher_t { +class monument_place_searcher_t : public placesearcher_t { public: - monument_platz_sucher_t(karte_t* welt, sint16 radius) : platzsucher_t(welt, radius) {} + monument_place_searcher_t(karte_t* welt, sint16 radius) : placesearcher_t(welt, radius) {} - virtual bool ist_feld_ok(koord pos, koord d, climate_bits cl) const + virtual bool is_field_ok(koord pos, koord d, climate_bits cl) const { const planquadrat_t* plan = welt->access(pos + d); @@ -519,7 +519,7 @@ return false; } - if (ist_randfeld(d)) { + if (is_randomfield(d)) { return gr->get_grund_hang() == slope_t::flat && // Flach gr->get_typ() == grund_t::boden && // Boden -> no building @@ -538,17 +538,17 @@ /** - * townhallplatz_sucher_t: + * townhall_place_searcher_t: * * 22-Dec-02: Hajo: added safety checks for gr != 0 and plan != 0 * * @author V. Meyer */ -class townhallplatz_sucher_t : public platzsucher_t { +class townhall_place_searcher_t : public placesearcher_t { public: - townhallplatz_sucher_t(karte_t* welt, uint8 dir_) : platzsucher_t(welt), dir(dir_) {} + townhall_place_searcher_t(karte_t* welt, uint8 dir_) : placesearcher_t(welt), dir(dir_) {} - virtual bool ist_feld_ok(koord pos, koord d, climate_bits cl) const + virtual bool is_field_ok(koord pos, koord d, climate_bits cl) const { const grund_t* gr = welt->lookup_kartenboden(pos + d); if (gr == NULL || gr->get_grund_hang() != slope_t::flat) { @@ -569,7 +569,7 @@ if ( ((dir & ribi_t::south)!=0 && d.y == h - 1) || ((dir & ribi_t::west)!=0 && d.x == 0) || ((dir & ribi_t::north)!=0 && d.y == 0) || - ((dir & ribi_t::east)!=0 && d.x == b - 1)) { + ((dir & ribi_t::east)!=0 && d.x == w - 1)) { // we want to build a road here: return gr->get_typ() == grund_t::boden && @@ -2269,18 +2269,18 @@ /** - * bauplatz_mit_strasse_sucher_t: + * building_place_with_road_searcher: * Search a free place for a building using function suche_platz() (search place). * added: Minimum distance between monuments * @author V. Meyer/prissi */ -class bauplatz_mit_strasse_sucher_t: public bauplatz_sucher_t +class building_place_with_road_searcher: public building_place_searcher_t { public: /// if false, this will the check 'do not build next other to special buildings' bool big_city; - bauplatz_mit_strasse_sucher_t(karte_t* welt, sint16 radius, bool big) : bauplatz_sucher_t(welt, radius), big_city(big) {} + building_place_with_road_searcher(karte_t* welt, sint16 radius, bool big) : building_place_searcher_t(welt, radius), big_city(big) {} // get distance to next special building int find_dist_next_special(koord pos) const @@ -2302,20 +2302,20 @@ return dist; } - virtual bool ist_platz_ok(koord pos, sint16 b, sint16 h, climate_bits cl) const + virtual bool is_place_ok(koord pos, sint16 w, sint16 h, climate_bits cl) const { - if( !bauplatz_sucher_t::ist_platz_ok(pos, b, h, cl) ) { + if( !building_place_searcher_t::is_place_ok(pos, w, h, cl) ) { return false; } bool next_to_road = false; // not direct next to factories or townhalls - for (sint16 x = -1; x < b; x++) { + for (sint16 x = -1; x < w; x++) { for (sint16 y = -1; y < h; y++) { grund_t *gr = welt->lookup_kartenboden(pos + koord(x,y)); if (!gr) { return false; } - if ( 0 <= x && x < b-1 && 0 <= y && y < h-1) { + if ( 0 <= x && x < w-1 && 0 <= y && y < h-1) { // inside: nothing on top like elevated monorails? if( gr->get_leitung()!=NULL || welt->lookup(gr->get_pos()+koord3d(0,0,1) )!=NULL) { // something on top (monorail or powerlines) @@ -2345,7 +2345,7 @@ } // try to built a little away from previous ones - if (big_city && find_dist_next_special(pos) < b + h + welt->get_settings().get_special_building_distance() ) { + if (big_city && find_dist_next_special(pos) < w + h + welt->get_settings().get_special_building_distance() ) { return false; } return true; @@ -2364,7 +2364,7 @@ bool is_rotate = desc->get_all_layouts() > 1; sint16 radius = koord_distance( get_rechtsunten(), get_linksoben() )/2 + 10; // find place - koord best_pos = bauplatz_mit_strasse_sucher_t(welt, radius, big_city).suche_platz(pos, desc->get_x(), desc->get_y(), desc->get_allowed_climate_bits(), &is_rotate); + koord best_pos = building_place_with_road_searcher(welt, radius, big_city).search_place(pos, desc->get_x(), desc->get_y(), desc->get_allowed_climate_bits(), &is_rotate); if (best_pos != koord::invalid) { // then built it @@ -2389,7 +2389,7 @@ if (desc) { koord total_size = koord(2 + desc->get_x(), 2 + desc->get_y()); sint16 radius = koord_distance( get_rechtsunten(), get_linksoben() )/2 + 10; - koord best_pos(monument_platz_sucher_t(welt, radius).suche_platz(pos, total_size.x, total_size.y, desc->get_allowed_climate_bits())); + koord best_pos(monument_place_searcher_t(welt, radius).search_place(pos, total_size.x, total_size.y, desc->get_allowed_climate_bits())); if (best_pos != koord::invalid) { // check if borders around the monument are inside the map limits @@ -2624,7 +2624,7 @@ road1.y = desc->get_y(layout); } if (neugruendung || umziehen) { - best_pos = townhallplatz_sucher_t(welt, dir).suche_platz(pos, desc->get_x(layout) + (dir & ribi_t::eastwest ? 1 : 0), desc->get_y(layout) + (dir & ribi_t::northsouth ? 1 : 0), desc->get_allowed_climate_bits()); + best_pos = townhall_place_searcher_t(welt, dir).search_place(pos, desc->get_x(layout) + (dir & ribi_t::eastwest ? 1 : 0), desc->get_y(layout) + (dir & ribi_t::northsouth ? 1 : 0), desc->get_allowed_climate_bits()); } // check, if the was something found if(best_pos==koord::invalid) { Index: sucher/bauplatz_sucher.h =================================================================== --- sucher/bauplatz_sucher.h (revision 8093) +++ sucher/bauplatz_sucher.h (working copy) @@ -5,25 +5,25 @@ * (see license.txt) */ -#ifndef bauplatz_sucher_t_h -#define bauplatz_sucher_t_h +#ifndef building_place_searcher_t_h +#define building_place_searcher_t_h #include "platzsucher.h" #include "../simworld.h" /** - * bauplatz_sucher_t: + * building_place_searcher_t: * - * Search a free site for building using function suche_platz(). + * Search a free site for building using function search_place(). * * @author V. Meyer */ -class bauplatz_sucher_t : public platzsucher_t { +class building_place_searcher_t : public placesearcher_t { public: - bauplatz_sucher_t(karte_t *welt, sint16 radius = -1) : platzsucher_t(welt, radius) {} + building_place_searcher_t(karte_t *welt, sint16 radius = -1) : placesearcher_t(welt, radius) {} - virtual bool ist_platz_ok(koord pos, sint16 b, sint16 h, climate_bits cl) const { - return welt->square_is_free(pos, b, h, NULL, cl); + virtual bool is_place_ok(koord pos, sint16 w, sint16 h, climate_bits cl) const { + return welt->square_is_free(pos, w, h, NULL, cl); } }; Index: sucher/platzsucher.cc =================================================================== --- sucher/platzsucher.cc (revision 8092) +++ sucher/platzsucher.cc (working copy) @@ -14,33 +14,33 @@ #include "../simtypes.h" #include "platzsucher.h" -pos_liste_t::pos_liste_t(sint16 max_radius) +pos_list_t::pos_list_t(sint16 max_radius) { this->max_radius = max_radius + 1; spalten = new sint16[this->max_radius]; - neu_starten(); + restart(); } -pos_liste_t::~pos_liste_t() +pos_list_t::~pos_list_t() { delete [] spalten; } -void pos_liste_t::neu_starten() +void pos_list_t::restart() { radius = 1; spalten[0] = 0; - reihe = 0; + row = 0; quadrant = 0; } -sint16 pos_liste_t::suche_beste_reihe() +sint16 pos_list_t::search_best_row() { sint16 best_dist = -1; - sint16 beste_reihe = -1; + sint16 best_row = -1; for(sint16 i = 0; i < radius; i++) { if(spalten[i] < radius) { @@ -48,7 +48,7 @@ if(best_dist == -1 || dist < best_dist) { best_dist = dist; - beste_reihe = i; + best_row = i; } } } @@ -55,33 +55,33 @@ if(radius < max_radius && best_dist > radius * radius) { return -1; } else { - return beste_reihe; + return best_row; } } -bool pos_liste_t::get_naechste_pos(koord &k) +bool pos_list_t::get_next_pos(koord &k) { - if(reihe != -1) { + if(row != -1) { if(quadrant++ == 4) { quadrant = 1; - spalten[reihe]++; + spalten[row]++; - reihe = suche_beste_reihe(); - if(reihe == -1) { + row = search_best_row(); + if(row == -1) { if(radius < max_radius) { spalten[radius++] = 0; } - reihe = suche_beste_reihe(); + row = search_best_row(); } } } - if(reihe != -1) { - if(quadrant == 1 && !reihe) { + if(row != -1) { + if(quadrant == 1 && !row) { quadrant += 2; // skip second 0, +/-y } - if(quadrant % 2 == 1 && !spalten[reihe]) { + if(quadrant % 2 == 1 && !spalten[row]) { quadrant ++; // skip second +/-x, 0 } return get_pos(k); @@ -90,21 +90,21 @@ } -bool pos_liste_t::get_pos(koord &k) +bool pos_list_t::get_pos(koord &k) { - if(reihe != -1) { + if(row != -1) { switch(quadrant) { case 1: - k = koord(reihe, spalten[reihe]); + k = koord(row, spalten[row]); return true; case 2: - k = koord(reihe, (short)-spalten[reihe]); + k = koord(row, (short)-spalten[row]); return true; case 3: - k = koord((short)-reihe, spalten[reihe]); + k = koord((short)-row, spalten[row]); return true; case 4: - k = koord(-reihe, -spalten[reihe]); + k = koord(-row, -spalten[row]); return true; } } @@ -112,23 +112,23 @@ } -pos_liste_wh_t::pos_liste_wh_t(sint16 max_radius, sint16 b, sint16 h) : - pos_liste_t(max_radius) +pos_list_wh_t::pos_list_wh_t(sint16 max_radius, sint16 w, sint16 h) : + pos_list_t(max_radius) { - neu_starten(b, h); + restart(w, h); } -void pos_liste_wh_t::neu_starten(sint16 b, sint16 h) +void pos_list_wh_t::restart(sint16 w, sint16 h) { - this->b = b; + this->w = w; this->h = h; dx = dy = 0; - pos_liste_t::neu_starten(); + pos_list_t::restart(); } -bool pos_liste_wh_t::get_naechste_pos(koord &k) +bool pos_list_wh_t::get_next_pos(koord &k) { get_pos(k); @@ -138,7 +138,7 @@ } else if(dy > 0) { dy--; - dx = b - 1; + dx = w - 1; } k.x -= dx; k.y -= dy; @@ -152,22 +152,22 @@ else if(dy > 0) { k.y -= --dy; if(k.x <= 0) { - k.x -= b - 1; + k.x -= w - 1; } } else { - if(pos_liste_t::get_naechste_pos(k)) { + if(pos_list_t::get_next_pos(k)) { if(k.y == 0) { dy = h - 1; } if(k.x == 0) { - dx = b - 1; + dx = w - 1; } if(k.y <= 0) { k.y -= h - 1; } if(k.x <= 0) { - k.x -= b - 1; + k.x -= w - 1; } } else { @@ -178,17 +178,17 @@ } -bool platzsucher_t::ist_platz_ok(koord pos, sint16 b, sint16 h,climate_bits cl) const +bool placesearcher_t::is_place_ok(koord pos, sint16 w, sint16 h,climate_bits cl) const { if(!welt->is_within_limits(pos)) { return false; } - koord k(b, h); + koord k(w, h); while(k.y-- > 0) { - k.x = b; + k.x = w; while(k.x-- > 0) { - if(!ist_feld_ok(pos, k, cl)) { + if(!is_field_ok(pos, k, cl)) { return false; } } @@ -196,46 +196,46 @@ return true; } -bool platzsucher_t::ist_randfeld(koord d) const +bool placesearcher_t::is_randomfield(koord d) const { - return d.x == 0 || d.x == b - 1 || d.y == 0 || d.y == h - 1; + return d.x == 0 || d.x == w - 1 || d.y == 0 || d.y == h - 1; } -bool platzsucher_t::ist_feld_ok(koord /*pos*/, koord /*d*/, climate_bits /*cl*/) const +bool placesearcher_t::is_field_ok(koord /*pos*/, koord /*d*/, climate_bits /*cl*/) const { return true; } -koord platzsucher_t::suche_platz(koord start, sint16 b, sint16 h, climate_bits cl, bool *r) +koord placesearcher_t::search_place(koord start, sint16 w, sint16 h, climate_bits cl, bool *r) { sint16 radius = max_radius > 0 ? max_radius : welt->get_size_max(); - pos_liste_wh_t psuch1(radius, b, h); + pos_list_wh_t results_straight(radius, w, h); - this->b = b; + this->w = w; this->h = h; koord rel1, rel2; - if((r && *r) && b != h) { + if((r && *r) && w != h) { // - // Hier suchen wir auch gedrehte Positionen. + // Here we also search for the rotated positions. // - pos_liste_wh_t psuch2(radius, h, b); + pos_list_wh_t results_rotated(radius, h, w); - if(ist_platz_ok(start, b, h, cl)) { + if(is_place_ok(start, w, h, cl)) { *r = false; return start; } - if(ist_platz_ok(start, h, b, cl)) { + if(is_place_ok(start, h, w, cl)) { *r = true; return start; } - while(psuch1.get_naechste_pos(rel1) && psuch2.get_naechste_pos(rel2)) { - if(ist_platz_ok(start + rel1, b, h, cl)) { + while(results_straight.get_next_pos(rel1) && results_rotated.get_next_pos(rel2)) { + if(is_place_ok(start + rel1, w, h, cl)) { *r = false; return start + rel1; } - if(ist_platz_ok(start + rel2, h, b, cl)) { + if(is_place_ok(start + rel2, h, w, cl)) { *r = true; return start + rel2; } @@ -244,13 +244,13 @@ } else { // - // Suche ohne gedrehte Positionen. + // Search without rotated positions. // - if(ist_platz_ok(start, b, h, cl)) { + if(is_place_ok(start, w, h, cl)) { return start; } - while(psuch1.get_naechste_pos(rel1)) { - if(ist_platz_ok(start + rel1, b, h, cl)) { + while(results_straight.get_next_pos(rel1)) { + if(is_place_ok(start + rel1, w, h, cl)) { if(r) { *r = false; } Index: sucher/platzsucher.h =================================================================== --- sucher/platzsucher.h (revision 8092) +++ sucher/platzsucher.h (working copy) @@ -7,89 +7,89 @@ * Author: V. Meyer */ -#ifndef __PLATZSUCHER_H -#define __PLATZSUCHER_H +#ifndef __PLACESEARCHER_H +#define __PLACESEARCHER_H #include "../dataobj/koord.h" class karte_t; /** - * pos_liste_t: + * pos_list_t: * - * Liefert nach wachsender Entfernung von (0, 0) sortiert alle Koordinaten - * mit x und y im Bereich [-max_xy;max_xy] außer (0, 0) selber. - * (0, 0) wird als Endekenzeichen verwendet. + * Provides a list of all coordinates from (0, 0) sorted by distance in increasing + * order with x and y in range [-max_xy; max_xy] except for (0, 0) itself. + * (0, 0) is used as the end marker. * * @author V. Meyer */ -class pos_liste_t { +class pos_list_t { sint16 max_radius; sint16 *spalten; sint16 radius; - sint16 reihe; + sint16 row; sint16 quadrant; - sint16 suche_beste_reihe(); + sint16 search_best_row(); public: /** - * @param max_xy (Maximalwert für x und y-Position) + * @param max_xy (Maximum value for x and y position) * * @author V. Meyer */ - pos_liste_t(sint16 max_xy); - virtual ~pos_liste_t(); + pos_list_t(sint16 max_xy); + virtual ~pos_list_t(); - void neu_starten(); + void restart(); bool get_pos(koord &k); - virtual bool get_naechste_pos(koord &k); + virtual bool get_next_pos(koord &k); }; /** - * pos_liste_wh_t: + * pos_list_wh_t: * - * Erweiterte Version von pos_liste_t. Liefert die umliegenden Positionen für - * einen Bereich der Größe h mal w. - * (0, 0) wird wieder als Endekenzeichen verwendet. + * Extended version of pos_list_t. Provides surrounding positions + * for a range of size h by w. + * (0, 0) is used as the end marker again. * * @author V. Meyer */ -class pos_liste_wh_t : public pos_liste_t { - sint16 b; +class pos_list_wh_t : public pos_list_t { + sint16 w; sint16 h; sint16 dx; sint16 dy; public: - pos_liste_wh_t(sint16 max_radius, sint16 b, sint16 h); + pos_list_wh_t(sint16 max_radius, sint16 w, sint16 h); - void neu_starten(sint16 b, sint16 h); - void neu_starten() { pos_liste_t::neu_starten(); } + void restart(sint16 w, sint16 h); + void restart() { pos_list_t::restart(); } - bool get_naechste_pos(koord &k); + bool get_next_pos(koord &k); }; /** * @author V. Meyer */ -class platzsucher_t { +class placesearcher_t { protected: karte_t *welt; - sint16 b; + sint16 w; sint16 h; sint16 max_radius; - virtual bool ist_platz_ok(koord pos, sint16 b, sint16 h, climate_bits cl) const; + virtual bool is_place_ok(koord pos, sint16 w, sint16 h, climate_bits cl) const; - virtual bool ist_feld_ok(koord pos, koord d, climate_bits cl) const; + virtual bool is_field_ok(koord pos, koord d, climate_bits cl) const; - bool ist_randfeld(koord d) const; + bool is_randomfield(koord d) const; - platzsucher_t(karte_t *welt, sint16 _max_radius = - 1) { this->welt = welt; max_radius = _max_radius; } - virtual ~platzsucher_t() {} + placesearcher_t(karte_t *welt, sint16 _max_radius = - 1) { this->welt = welt; max_radius = _max_radius; } + virtual ~placesearcher_t() {} public: - koord suche_platz(koord start, sint16 b, sint16 h, climate_bits cl, bool *r = NULL); + koord search_place(koord start, sint16 w, sint16 h, climate_bits cl, bool *r = NULL); }; #endif