dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r17420) -Codechange: replace assert() by assert_compile() where possible

Browse Source
This commit is contained in:
smatz
2009-09-04 23:02:52 +00:00
parent d3b8de0162
commit dc73d5432d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/economy.cpp
View File

@@ -738,7 +738,7 @@ void StartupEconomy()
{
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++) {

4
src/graph_gui.cpp
View File

@@ -213,7 +213,7 @@ protected:
/* 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 @@ static NWidgetBase *MakePerformanceDetailPanels(int *biggest_index)
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++) {

2
src/misc_gui.cpp
View File

@@ -788,7 +788,7 @@ struct TooltipsWindow : public Window
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;

2
src/newgrf.cpp
View File

@@ -5652,7 +5652,7 @@ static void InitNewGRFFile(const GRFConfig *config, int sprite_offset)
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));