Skip to content

Commit

Permalink
Remove superflous casts, because the type is already correct or the d…
Browse files Browse the repository at this point in the history 
…esired type is a base class of the given type

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@524 8aca7d54-2c30-db11-9de9-000461428c89
  • Loading branch information
@chmallon
chmallon committed Dec 6, 2006
1 parent 54ef5a9 commit fbf17e7
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion dataobj/koord3d.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const koord3d koord3d::invalid(-1, -1, -1);

void * koord3d::operator new(size_t /*s*/)
{
return (koord3d *)freelist_t::gimme_node(sizeof(koord3d));
return freelist_t::gimme_node(sizeof(koord3d));
}


Expand Down
2 changes: 1 addition & 1 deletion dings/baum.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ baum_t::entferne(spieler_t *sp)
void *
baum_t::operator new(size_t /*s*/)
{
return (baum_t *)freelist_t::gimme_node(sizeof(baum_t));
return freelist_t::gimme_node(sizeof(baum_t));
}


Expand Down
2 changes: 1 addition & 1 deletion dings/dummy.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dummy_ding_t::dummy_ding_t(karte_t *welt, koord3d pos, spieler_t *) :

void * dummy_ding_t::operator new(size_t /*s*/)
{
return (dummy_ding_t *)freelist_t::gimme_node(sizeof(dummy_ding_t));
return freelist_t::gimme_node(sizeof(dummy_ding_t));
}


Expand Down
4 changes: 2 additions & 2 deletions gui/money_frame.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ money_frame_t::money_frame_t(spieler_t *sp)
chart.set_background(MN_GREY1);
int i;
for (i = 0; i<MAX_COST; i++) {
chart.add_curve(cost_type_color[i], (sint64 *)sp->get_finance_history_year(), MAX_COST, i, 12, i<MAX_COST-2 ? MONEY: STANDARD, false, false);
chart.add_curve(cost_type_color[i], sp->get_finance_history_year(), MAX_COST, i, 12, i < MAX_COST - 2 ? MONEY: STANDARD, false, false);
}
//CHART YEAR END

Expand All @@ -135,7 +135,7 @@ money_frame_t::money_frame_t(spieler_t *sp)
mchart.set_seed(0);
mchart.set_background(MN_GREY1);
for (i = 0; i<MAX_COST; i++) {
mchart.add_curve(cost_type_color[i], (sint64 *)sp->get_finance_history_month(), MAX_COST, i, 12, i<MAX_COST-2 ? MONEY: STANDARD, false, false);
mchart.add_curve(cost_type_color[i], sp->get_finance_history_month(), MAX_COST, i, 12, i < MAX_COST - 2 ? MONEY: STANDARD, false, false);
}
mchart.set_visible(false);
//CHART MONTH END
Expand Down
2 changes: 1 addition & 1 deletion gui/schedule_list.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ void schedule_list_gui_t::update_lineinfo(linehandle_t new_line)
// chart
chart.remove_curves();
for(i=0; i<MAX_LINE_COST; i++) {
chart.add_curve(cost_type_color[i], (sint64 *)new_line->get_finance_history(), MAX_LINE_COST, statistic[i], MAX_MONTHS, statistic_type[i], filterButtons[i].pressed, true);
chart.add_curve(cost_type_color[i], new_line->get_finance_history(), MAX_LINE_COST, statistic[i], MAX_MONTHS, statistic_type[i], filterButtons[i].pressed, true);
if(filterButtons[i].pressed) {
chart.show_curve(i);
}
Expand Down
4 changes: 2 additions & 2 deletions gui/stadt_info.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ stadt_info_t::stadt_info_t(stadt_t *stadt) :
chart.set_background(MN_GREY1);
int i;
for (i = 0; i<MAX_CITY_HISTORY; i++) {
chart.add_curve(hist_type_color[i], (sint64 *)stadt->get_city_history_year(), MAX_CITY_HISTORY, i, 12, STANDARD, i<2, true);
chart.add_curve(hist_type_color[i], stadt->get_city_history_year(), MAX_CITY_HISTORY, i, 12, STANDARD, i < 2, true);
}
//CHART YEAR END

Expand All @@ -71,7 +71,7 @@ stadt_info_t::stadt_info_t(stadt_t *stadt) :
mchart.set_seed(0);
mchart.set_background(MN_GREY1);
for (i = 0; i<MAX_CITY_HISTORY; i++) {
mchart.add_curve(hist_type_color[i], (sint64 *)stadt->get_city_history_month(), MAX_CITY_HISTORY, i, 12, STANDARD, i<2, true);
mchart.add_curve(hist_type_color[i], stadt->get_city_history_month(), MAX_CITY_HISTORY, i, 12, STANDARD, i < 2, true);
}
mchart.set_visible(false);
//CHART MONTH END
Expand Down
10 changes: 5 additions & 5 deletions simdepot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ class depot_t : public gebaeude_t
int get_oldest_vehicle(int id);

#if USE_NEW_GEBAUDE
virtual void * operator new(size_t s) { return (depot_t *)freelist_t::gimme_node(sizeof(depot_t)); }
virtual void* operator new(size_t s) { return freelist_t::gimme_node(sizeof(depot_t)); }
virtual void operator delete(void* p) { freelist_t::putback_node(sizeof(depot_t), p); }
#endif
};
Expand Down Expand Up @@ -270,7 +270,7 @@ class bahndepot_t : public depot_t
virtual const char *gib_name() const {return "Bahndepot"; }

#if USE_NEW_GEBAUDE
virtual void * operator new(size_t s) { return (bahndepot_t *)freelist_t::gimme_node(sizeof(bahndepot_t)); }
virtual void* operator new(size_t s) { return freelist_t::gimme_node(sizeof(bahndepot_t)); }
virtual void operator delete(void* p) { freelist_t::putback_node(sizeof(bahndepot_t), p); }
#endif
};
Expand Down Expand Up @@ -339,7 +339,7 @@ class strassendepot_t : public depot_t
const char *gib_name() const {return "Strassendepot";}

#if USE_NEW_GEBAUDE
virtual void * operator new(size_t s) { return (strassendepot_t *)freelist_t::gimme_node(sizeof(strassendepot_t)); }
virtual void* operator new(size_t s) { return freelist_t::gimme_node(sizeof(strassendepot_t)); }
virtual void operator delete(void* p) { freelist_t::putback_node(sizeof(strassendepot_t), p); }
#endif
};
Expand Down Expand Up @@ -380,7 +380,7 @@ class schiffdepot_t : public depot_t
const char *gib_name() const {return "Schiffdepot";}

#if USE_NEW_GEBAUDE
virtual void * operator new(size_t s) { return (schiffdepot_t *)freelist_t::gimme_node(sizeof(schiffdepot_t)); }
virtual void* operator new(size_t s) { return freelist_t::gimme_node(sizeof(schiffdepot_t)); }
virtual void operator delete(void* p) { freelist_t::putback_node(sizeof(schiffdepot_t), p); }
#endif
};
Expand Down Expand Up @@ -414,7 +414,7 @@ class airdepot_t : public depot_t
const char *gib_name() const {return "Hangar";}

#if USE_NEW_GEBAUDE
virtual void * operator new(size_t s) { return (airdepot_t *)freelist_t::gimme_node(sizeof(airdepot_t)); }
virtual void* operator new(size_t s) { return freelist_t::gimme_node(sizeof(airdepot_t)); }
virtual void operator delete(void* p) { freelist_t::putback_node(sizeof(airdepot_t), p); }
#endif
};
Expand Down
2 changes: 1 addition & 1 deletion simplay.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2376,7 +2376,7 @@ spieler_t::create_simple_road_transport()
if(road_vehicle) {
vehikel_t* test_driver = new automobil_t(welt, koord3d(platz1, 0), road_vehicle, this, NULL);
route_t verbindung;
if( verbindung.calc_route(welt,welt->lookup(platz1)->gib_kartenboden()->gib_pos(),welt->lookup(platz2)->gib_kartenboden()->gib_pos(),(fahrer_t *)test_driver,0) &&
if (verbindung.calc_route(welt, welt->lookup(platz1)->gib_kartenboden()->gib_pos(), welt->lookup(platz2)->gib_kartenboden()->gib_pos(), test_driver, 0) &&
verbindung.gib_max_n()<2*(sint32)abs_distance(platz1,platz2)) {
DBG_MESSAGE("spieler_t::create_simple_road_transport()","Already connection between %d,%d to %d,%d is only %i",platz1.x, platz1.y, platz2.x, platz2.y, verbindung.gib_max_n() );
// found something with the nearly same lenght
Expand Down
4 changes: 2 additions & 2 deletions simwerkz.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ DBG_MESSAGE("wkz_wayremover()", "Setting end to %d,%d,%d",gr->gib_pos().x, gr->g
vehikel_besch_t remover_besch(wt, 1, vehikel_besch_t::diesel );
vehikel_t *test_driver = vehikelbauer_t::baue( welt, start, sp, NULL, &remover_besch);
if(test_driver) {
can_delete = verbindung.calc_route(welt,start,gr->gib_pos(),(fahrer_t*)test_driver,0);
can_delete = verbindung.calc_route(welt, start, gr->gib_pos(), test_driver, 0);
delete test_driver;
DBG_MESSAGE("wkz_wayremover()","route search returned %d",can_delete);
}
Expand Down Expand Up @@ -979,7 +979,7 @@ wkz_wayobj(spieler_t *sp, karte_t *welt, koord pos, value_t lParam)
vehikel_besch_t remover_besch(wt, 1, vehikel_besch_t::diesel );
vehikel_t *test_driver = vehikelbauer_t::baue( welt, start, sp, NULL, &remover_besch);
if(test_driver) {
can_built = verbindung.calc_route(welt,start,gr->gib_pos(),(fahrer_t*)test_driver,0);
can_built = verbindung.calc_route(welt, start, gr->gib_pos(), test_driver, 0);
delete test_driver;
DBG_MESSAGE("wkz_wayremover()","route search returned %d",can_built);
}
Expand Down
2 changes: 1 addition & 1 deletion simworld.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1443,7 +1443,7 @@ karte_t::get_random_fab() const

if(anz > 0) {
const int end = simrand( anz );
result = (fabrik_t *)fab_list.at(end);
result = fab_list.at(end);
}
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion simworld.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ class karte_t
bool add_fab(fabrik_t *fab);
bool rem_fab(fabrik_t *fab);
int gib_fab_index(fabrik_t* fab) { return fab_list.index_of(fab); }
fabrik_t* gib_fab(unsigned index) { return index < fab_list.count() ? (fabrik_t*)fab_list.at(index) : NULL; }
fabrik_t* gib_fab(unsigned index) { return index < fab_list.count() ? fab_list.at(index) : NULL; }
const slist_tpl<fabrik_t*>& gib_fab_list() const { return fab_list; }

/* sucht zufaellig eine Fabrik aus der Fabrikliste
Expand Down

0 comments on commit fbf17e7

Please sign in to comment.