Mercurial > hg > openttd
changeset 12927:950767ea4ee5 draft
(svn r17420) -Codechange: replace assert() by assert_compile() where possible
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Fri, 04 Sep 2009 23:02:52 +0000 |
| parents | fb762288aac2 |
| children | 871f498af332 |
| files | src/economy.cpp src/graph_gui.cpp src/misc_gui.cpp src/newgrf.cpp |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/economy.cpp +++ b/src/economy.cpp @@ -738,7 +738,7 @@ { int i; - assert(sizeof(_price) == NUM_PRICES * sizeof(Money)); + assert_compile(sizeof(_price) == NUM_PRICES * sizeof(Money)); /* Setup price bases */ for (i = 0; i < NUM_PRICES; i++) {
--- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -213,7 +213,7 @@ /* the colours and cost array of GraphDrawer must accomodate * both values for cargo and companies. So if any are higher, quit */ - assert(GRAPH_MAX_DATASETS >= (int)NUM_CARGO && GRAPH_MAX_DATASETS >= (int)MAX_COMPANIES); + assert_compile(GRAPH_MAX_DATASETS >= (int)NUM_CARGO && GRAPH_MAX_DATASETS >= (int)MAX_COMPANIES); assert(this->num_vert_lines > 0); byte grid_colour = _colour_gradient[COLOUR_GREY][4]; @@ -1244,7 +1244,7 @@ STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP, }; - assert(lengthof(performance_tips) == SCORE_END - SCORE_BEGIN); + assert_compile(lengthof(performance_tips) == SCORE_END - SCORE_BEGIN); NWidgetVertical *vert = new NWidgetVertical(); for (int widnum = PRW_SCORE_FIRST; widnum <= PRW_SCORE_LAST; widnum++) {
--- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -788,7 +788,7 @@ Window(x, y, width, height, WC_TOOLTIPS, widget) { this->string_id = str; - assert(sizeof(this->params[0]) == sizeof(params[0])); + assert_compile(sizeof(this->params[0]) == sizeof(params[0])); assert(paramcount <= lengthof(this->params)); memcpy(this->params, params, sizeof(this->params[0]) * paramcount); this->paramcount = paramcount;
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -5652,7 +5652,7 @@ newfile->traininfo_vehicle_width = TRAININFO_DEFAULT_VEHICLE_WIDTH; /* Copy the initial parameter list */ - assert(lengthof(newfile->param) == lengthof(config->param) && lengthof(config->param) == 0x80); + assert_compile(lengthof(newfile->param) == lengthof(config->param) && lengthof(config->param) == 0x80); newfile->param_end = config->num_params; memcpy(newfile->param, config->param, sizeof(newfile->param));