Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.

Browse Source
This commit is contained in:
maedhros 2007-01-21 20:34:28 +00:00
parent c7b1268336
commit 45bb50d6b6
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/graph_gui.cpp
View File

@ -65,8 +65,6 @@ static const int64 INVALID_VALUE = 0x80000000;
static void DrawGraph(const GraphDrawer *gw) static void DrawGraph(const GraphDrawer *gw)
{ {
int i,j,k;
uint x,y,old_x,old_y; uint x,y,old_x,old_y;
int right; int right;
int num_x, num_dataset; int num_x, num_dataset;
@ -174,22 +172,21 @@ static void DrawGraph(const GraphDrawer *gw)
if (gw->month != 0xFF) { if (gw->month != 0xFF) {
x = gw->left + GRAPH_X_POSITION_BEGINNING; x = gw->left + GRAPH_X_POSITION_BEGINNING;
y = gw->top + gw->height + 1; y = gw->top + gw->height + 1;
j = gw->month; byte month = gw->month;
k = gw->year; Year year = gw->year;
i = gw->num_on_x_axis;assert(i>0); for (int i = 0; i < gw->num_on_x_axis; i++) {
do { SetDParam(0, month + STR_0162_JAN);
SetDParam(2, k); SetDParam(1, month + STR_0162_JAN + 2);
SetDParam(0, j + STR_0162_JAN); SetDParam(2, year);
SetDParam(1, j + STR_0162_JAN + 2); DrawString(x, y, month == 0 ? STR_016F : STR_016E, GRAPH_AXIS_LABEL_COLOUR);
DrawString(x, y, j == 0 ? STR_016F : STR_016E, GRAPH_AXIS_LABEL_COLOUR);
j += 3; month += 3;
if (j >= 12) { if (month >= 12) {
j = 0; month = 0;
k++; year++;
} }
x += GRAPH_X_POSITION_SEPARATION; x += GRAPH_X_POSITION_SEPARATION;
} while (--i); }
} else { } else {
/* Add 8 to make the string appear centred between the lines. */ /* Add 8 to make the string appear centred between the lines. */
x = gw->left + GRAPH_X_POSITION_BEGINNING + 8; x = gw->left + GRAPH_X_POSITION_BEGINNING + 8;
@ -205,10 +202,10 @@ static void DrawGraph(const GraphDrawer *gw)
} }
/* draw lines and dots */ /* draw lines and dots */
i = 0;
row_ptr = gw->cost[0]; row_ptr = gw->cost[0];
sel = gw->sel; // show only selected lines. GraphDrawer qw->sel set in Graph-Legend (_legend_excludebits) sel = gw->sel; // show only selected lines. GraphDrawer qw->sel set in Graph-Legend (_legend_excludebits)
do {
for (int i = 0; i < gw->num_dataset; i++) {
if (!(sel & 1)) { if (!(sel & 1)) {
/* Centre the dot between the grid lines. */ /* Centre the dot between the grid lines. */
x = gw->left + GRAPH_X_POSITION_BEGINNING + (GRAPH_X_POSITION_SEPARATION / 2); x = gw->left + GRAPH_X_POSITION_BEGINNING + (GRAPH_X_POSITION_SEPARATION / 2);
@ -233,7 +230,9 @@ static void DrawGraph(const GraphDrawer *gw)
x += GRAPH_X_POSITION_SEPARATION; x += GRAPH_X_POSITION_SEPARATION;
} }
} }
} while (sel>>=1,row_ptr+=24, ++i < gw->num_dataset); sel >>= 1;
row_ptr += 24;
}
} }
/****************/ /****************/