openttd-ottdgrfs: comparison src/graph

equal deleted inserted replaced

-:45d0233e7d79
+:187e3ef04cc9
 /* $Id$ */
+/** @file graph_gui.cpp */
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 enum {
 	GRAPH_MAX_DATASETS = 16,
 	GRAPH_AXIS_LABEL_COLOUR = 16,
 	GRAPH_AXIS_LINE_COLOUR  = 215,
-	GRAPH_X_POSITION_BEGINNING  = 44,  // Start the graph 44 pixels from gw->left
+	GRAPH_X_POSITION_BEGINNING  = 44,  ///< Start the graph 44 pixels from gw->left
-	GRAPH_X_POSITION_SEPARATION = 22,  // There are 22 pixels between each X value
+	GRAPH_X_POSITION_SEPARATION = 22,  ///< There are 22 pixels between each X value
-	/* How many horizontal lines to draw. 9 is convenient as that means the
+	GRAPH_NUM_LINES_Y = 9, ///< How many horizontal lines to draw.
-	 * distance between them is the height of the graph / 8, which is the same
+	/* 9 is convenient as that means the distance between them is the height of the graph / 8,
+	 * which is the same
 	 * as height >> 3. */
-	GRAPH_NUM_LINES_Y = 9,
 };
 /* Apparently these don't play well with enums. */
 static const int64 INVALID_DATAPOINT     = INT64_MAX; // Value used for a datapoint that shouldn't be drawn.
 static const uint  INVALID_DATAPOINT_POS = UINT_MAX;  // Used to determine if the previous point was drawn.
 typedef struct GraphDrawer {
-	uint excluded_data; // bitmask of the datasets that shouldn't be displayed.
+	uint excluded_data; ///< bitmask of the datasets that shouldn't be displayed.
 	byte num_dataset;
 	byte num_on_x_axis;
 	bool has_negative_values;
 	byte num_vert_lines;
 	/* These values are used if the graph is being plotted against values
 	 * rather than the dates specified by month and year. */
 	uint16 x_values_start;
 	uint16 x_values_increment;
-	int left, top;  // Where to start drawing the graph, in pixels.
+	int left, top;  ///< Where to start drawing the graph, in pixels.
-	uint height;    // The height of the graph in pixels.
+	uint height;    ///< The height of the graph in pixels.
 	StringID format_str_y_axis;
 	byte colors[GRAPH_MAX_DATASETS];
-	int64 cost[GRAPH_MAX_DATASETS][24]; // last 2 years
+	int64 cost[GRAPH_MAX_DATASETS][24]; ///< last 2 years
 } GraphDrawer;
 static void DrawGraph(const GraphDrawer *gw)
 {
-	uint x, y;            // Reused whenever x and y coordinates are needed.
+	uint x, y;            ///< Reused whenever x and y coordinates are needed.
-	int64 highest_value;  // Highest value to be drawn.
+	int64 highest_value;  ///< Highest value to be drawn.
-	int x_axis_offset;    // Distance from the top of the graph to the x axis.
+	int x_axis_offset;    ///< Distance from the top of the graph to the x axis.
 	/* the colors and cost array of GraphDrawer must accomodate
 	 * both values for cargo and players. So if any are higher, quit */
 	assert(GRAPH_MAX_DATASETS >= (int)NUM_CARGO && GRAPH_MAX_DATASETS >= (int)MAX_PLAYERS);
 	assert(gw->num_vert_lines > 0);
 /* GRAPH LEGEND */
 /****************/
 static void GraphLegendWndProc(BaseWindow *w, WindowEvent *e)
 {
-	const Player* p;
 	switch (e->event) {
-	case WE_CREATE: {
+		case WE_CREATE: {
-		uint i;
+			for (uint i = 3; i < w->widget_count; i++) {
-		for (i = 3; i < w->widget_count; i++) {
+				if (!HASBIT(_legend_excluded_players, i - 3)) w->LowerWidget(i);
-			if (!HASBIT(_legend_excluded_players, i - 3)) w->LowerWidget(i);
+			}
-		}
+			break;
-		break;
+		}
-	}
+		case WE_PAINT: {
-	case WE_PAINT:
+			const Player *p;
-		FOR_ALL_PLAYERS(p) {
-			if (!p->is_active) {
+			FOR_ALL_PLAYERS(p) {
+				if (p->is_active) continue;
 				SETBIT(_legend_excluded_players, p->index);
 				w->RaiseWidget(p->index + 3);
 			}
-		}
-		w->DrawWidgets();
+			w->DrawWidgets();
-		FOR_ALL_PLAYERS(p) {
+			FOR_ALL_PLAYERS(p) {
-			if (!p->is_active) continue;
+				if (!p->is_active) continue;
-			DrawPlayerIcon(p->index, 4, 18+p->index*12);
+				DrawPlayerIcon(p->index, 4, 18+p->index*12);
-			SetDParam(0, p->name_1);
+				SetDParam(0, p->name_1);
-			SetDParam(1, p->name_2);
+				SetDParam(1, p->name_2);
-			SetDParam(2, GetPlayerNameString(p->index, 3));
+				SetDParam(2, GetPlayerNameString(p->index, 3));
-			DrawString(21, 17 + p->index * 12, STR_7021, HASBIT(_legend_excluded_players, p->index) ? 0x10 : 0xC);
+				DrawString(21, 17 + p->index * 12, STR_7021, HASBIT(_legend_excluded_players, p->index) ? 0x10 : 0xC);
-		}
+			}
-		break;
+			break;
+		}
-	case WE_CLICK:
-		if (IS_INT_INSIDE(e->we.click.widget, 3, 11)) {
+		case WE_CLICK:
+			if (!IS_INT_INSIDE(e->we.click.widget, 3, 11)) return;
 			TOGGLEBIT(_legend_excluded_players, e->we.click.widget - 3);
 			w->ToggleWidgetLoweredState(e->we.click.widget);
 			w->SetDirty();
 			InvalidateWindow(WC_INCOME_GRAPH, 0);
 			InvalidateWindow(WC_OPERATING_PROFIT, 0);
 			InvalidateWindow(WC_DELIVERED_CARGO, 0);
 			InvalidateWindow(WC_PERFORMANCE_HISTORY, 0);
 			InvalidateWindow(WC_COMPANY_VALUE, 0);
-		}
+			break;
-		break;
 	}
 }
 static const OldWidget _graph_legend_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                       STR_018B_CLOSE_WINDOW},
 	const Player* p;
 	uint excluded_players = _legend_excluded_players;
 	byte nums;
 	int mo,yr;
-	// Exclude the players which aren't valid
+	/* Exclude the players which aren't valid */
 	FOR_ALL_PLAYERS(p) {
 		if (!p->is_active) SETBIT(excluded_players, p->index);
 	}
 	gd->excluded_data = excluded_players;
 	gd->num_vert_lines = 24;
 	nums = 0;
 	FOR_ALL_PLAYERS(p) {
-		if (p->is_active) nums = max(nums,p->num_valid_stat_ent);
+		if (p->is_active) nums = max(nums, p->num_valid_stat_ent);
 	}
-	gd->num_on_x_axis = min(nums,24);
+	gd->num_on_x_axis = min(nums, 24);
-	mo = (_cur_month/3-nums)*3;
+	mo = (_cur_month / 3 - nums) * 3;
 	yr = _cur_year;
 	while (mo < 0) {
 		yr--;
 		mo += 12;
 	}
 }
 static void OperatingProfitWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_PAINT: {
+		case WE_PAINT: {
-		GraphDrawer gd;
+			GraphDrawer gd;
-		const Player* p;
+			const Player* p;
-		int i,j;
-		int numd;
+			w->DrawWidgets();
-		w->DrawWidgets();
+			gd.left = 2;
+			gd.top = 18;
-		gd.left = 2;
+			gd.height = 136;
-		gd.top = 18;
+			gd.has_negative_values = true;
-		gd.height = 136;
+			gd.format_str_y_axis = STR_CURRCOMPACT;
-		gd.has_negative_values = true;
-		gd.format_str_y_axis = STR_CURRCOMPACT;
+			SetupGraphDrawerForPlayers(&gd);
-		SetupGraphDrawerForPlayers(&gd);
+			int numd = 0;
+			FOR_ALL_PLAYERS(p) {
-		numd = 0;
+				if (p->is_active) {
-		FOR_ALL_PLAYERS(p) {
+					gd.colors[numd] = _colour_gradient[p->player_color][6];
-			if (p->is_active) {
+					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-				gd.colors[numd] = _colour_gradient[p->player_color][6];
+						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : (p->old_economy[j].income + p->old_economy[j].expenses);
-				for (j = gd.num_on_x_axis, i = 0; --j >= 0;) {
+						i++;
-					gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : (p->old_economy[j].income + p->old_economy[j].expenses);
+					}
-					i++;
+				}
-				}
+				numd++;
 			}
-			numd++;
-		}
+			gd.num_dataset = numd;
-		gd.num_dataset = numd;
+			DrawGraph(&gd);
+			break;
-		DrawGraph(&gd);
+		}
-	}	break;
-	case WE_CLICK:
+		case WE_CLICK:
-		if (e->we.click.widget == 2) /* Clicked on Legend */
+			/* Clicked on legend? */
-			ShowGraphLegend();
+			if (e->we.click.widget == 2) ShowGraphLegend();
-		break;
+			break;
 	}
 }
 static const OldWidget _operating_profit_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                        STR_018B_CLOSE_WINDOW},
 /****************/
 static void IncomeGraphWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_PAINT: {
+		case WE_PAINT: {
-		GraphDrawer gd;
+			GraphDrawer gd;
-		const Player* p;
+			const Player* p;
-		int i,j;
-		int numd;
+			w->DrawWidgets();
-		w->DrawWidgets();
+			gd.left = 2;
+			gd.top = 18;
-		gd.left = 2;
+			gd.height = 104;
-		gd.top = 18;
+			gd.has_negative_values = false;
-		gd.height = 104;
+			gd.format_str_y_axis = STR_CURRCOMPACT;
-		gd.has_negative_values = false;
+			SetupGraphDrawerForPlayers(&gd);
-		gd.format_str_y_axis = STR_CURRCOMPACT;
-		SetupGraphDrawerForPlayers(&gd);
+			int numd = 0;
+			FOR_ALL_PLAYERS(p) {
-		numd = 0;
+				if (p->is_active) {
-		FOR_ALL_PLAYERS(p) {
+					gd.colors[numd] = _colour_gradient[p->player_color][6];
-			if (p->is_active) {
+					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-				gd.colors[numd] = _colour_gradient[p->player_color][6];
+						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].income;
-				for (j = gd.num_on_x_axis, i = 0; --j >= 0;) {
+						i++;
-					gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].income;
+					}
-					i++;
+				}
-				}
+				numd++;
 			}
-			numd++;
-		}
+			gd.num_dataset = numd;
-		gd.num_dataset = numd;
+			DrawGraph(&gd);
+			break;
-		DrawGraph(&gd);
+		}
-		break;
-	}
+		case WE_CLICK:
+			if (e->we.click.widget == 2) ShowGraphLegend();
-	case WE_CLICK:
+			break;
-		if (e->we.click.widget == 2)
-			ShowGraphLegend();
-		break;
 	}
 }
 static const OldWidget _income_graph_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},
 /*******************/
 static void DeliveredCargoGraphWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_PAINT: {
+		case WE_PAINT: {
-		GraphDrawer gd;
+			GraphDrawer gd;
-		const Player* p;
+			const Player* p;
-		int i,j;
-		int numd;
+			w->DrawWidgets();
-		w->DrawWidgets();
+			gd.left = 2;
+			gd.top = 18;
-		gd.left = 2;
+			gd.height = 104;
-		gd.top = 18;
+			gd.has_negative_values = false;
-		gd.height = 104;
+			gd.format_str_y_axis = STR_7024;
-		gd.has_negative_values = false;
+			SetupGraphDrawerForPlayers(&gd);
-		gd.format_str_y_axis = STR_7024;
-		SetupGraphDrawerForPlayers(&gd);
+			int numd = 0;
+			FOR_ALL_PLAYERS(p) {
-		numd = 0;
+				if (p->is_active) {
-		FOR_ALL_PLAYERS(p) {
+					gd.colors[numd] = _colour_gradient[p->player_color][6];
-			if (p->is_active) {
+					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-				gd.colors[numd] = _colour_gradient[p->player_color][6];
+						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].delivered_cargo;
-				for (j = gd.num_on_x_axis, i = 0; --j >= 0;) {
+						i++;
-					gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].delivered_cargo;
+					}
-					i++;
+				}
-				}
+				numd++;
 			}
-			numd++;
-		}
+			gd.num_dataset = numd;
-		gd.num_dataset = numd;
+			DrawGraph(&gd);
+			break;
-		DrawGraph(&gd);
+		}
-		break;
-	}
+		case WE_CLICK:
+			if (e->we.click.widget == 2) ShowGraphLegend();
-	case WE_CLICK:
+			break;
-		if (e->we.click.widget == 2)
-			ShowGraphLegend();
-		break;
 	}
 }
 static const OldWidget _delivered_cargo_graph_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                          STR_018B_CLOSE_WINDOW},
 /***********************/
 static void PerformanceHistoryWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_PAINT: {
+		case WE_PAINT: {
-		GraphDrawer gd;
+			GraphDrawer gd;
-		const Player* p;
+			const Player* p;
-		int i,j;
-		int numd;
+			w->DrawWidgets();
-		w->DrawWidgets();
+			gd.left = 2;
+			gd.top = 18;
-		gd.left = 2;
+			gd.height = 200;
-		gd.top = 18;
+			gd.has_negative_values = false;
-		gd.height = 200;
+			gd.format_str_y_axis = STR_7024;
-		gd.has_negative_values = false;
+			SetupGraphDrawerForPlayers(&gd);
-		gd.format_str_y_axis = STR_7024;
-		SetupGraphDrawerForPlayers(&gd);
+			int numd = 0;
+			FOR_ALL_PLAYERS(p) {
-		numd = 0;
+				if (p->is_active) {
-		FOR_ALL_PLAYERS(p) {
+					gd.colors[numd] = _colour_gradient[p->player_color][6];
-			if (p->is_active) {
+					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-				gd.colors[numd] = _colour_gradient[p->player_color][6];
+						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].performance_history;
-				for (j = gd.num_on_x_axis, i = 0; --j >= 0;) {
+						i++;
-					gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].performance_history;
+					}
-					i++;
+				}
-				}
+				numd++;
 			}
-			numd++;
-		}
+			gd.num_dataset = numd;
-		gd.num_dataset = numd;
+			DrawGraph(&gd);
+			break;
-		DrawGraph(&gd);
+		}
-		break;
-	}
+		case WE_CLICK:
+			if (e->we.click.widget == 2) ShowGraphLegend();
-	case WE_CLICK:
+			if (e->we.click.widget == 3) ShowPerformanceRatingDetail();
-		if (e->we.click.widget == 2)
+			break;
-			ShowGraphLegend();
-		if (e->we.click.widget == 3)
-			ShowPerformanceRatingDetail();
-		break;
 	}
 }
 static const OldWidget _performance_history_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                             STR_018B_CLOSE_WINDOW},
 /*****************/
 static void CompanyValueGraphWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_PAINT: {
+		case WE_PAINT: {
-		GraphDrawer gd;
+			GraphDrawer gd;
-		const Player* p;
+			const Player* p;
-		int i,j;
-		int numd;
+			w->DrawWidgets();
-		w->DrawWidgets();
+			gd.left = 2;
+			gd.top = 18;
-		gd.left = 2;
+			gd.height = 200;
-		gd.top = 18;
+			gd.has_negative_values = false;
-		gd.height = 200;
+			gd.format_str_y_axis = STR_CURRCOMPACT;
-		gd.has_negative_values = false;
+			SetupGraphDrawerForPlayers(&gd);
-		gd.format_str_y_axis = STR_CURRCOMPACT;
-		SetupGraphDrawerForPlayers(&gd);
+			int numd = 0;
+			FOR_ALL_PLAYERS(p) {
-		numd = 0;
+				if (p->is_active) {
-		FOR_ALL_PLAYERS(p) {
+					gd.colors[numd] = _colour_gradient[p->player_color][6];
-			if (p->is_active) {
+					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-				gd.colors[numd] = _colour_gradient[p->player_color][6];
+						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].company_value;
-				for (j = gd.num_on_x_axis, i = 0; --j >= 0;) {
+						i++;
-					gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].company_value;
+					}
-					i++;
+				}
-				}
+				numd++;
 			}
-			numd++;
-		}
+			gd.num_dataset = numd;
-		gd.num_dataset = numd;
+			DrawGraph(&gd);
+			break;
-		DrawGraph(&gd);
+		}
-		break;
-	}
+		case WE_CLICK:
+			if (e->we.click.widget == 2) ShowGraphLegend();
-	case WE_CLICK:
+			break;
-		if (e->we.click.widget == 2)
-			ShowGraphLegend();
-		break;
 	}
 }
 static const OldWidget _company_value_graph_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                STR_018B_CLOSE_WINDOW},
 /*****************/
 static void CargoPaymentRatesWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_CREATE: {
+		case WE_PAINT: {
-		uint i;
+			GraphDrawer gd;
-		for (i = 3; i < w->widget_count; i++) {
-			if (!HASBIT(_legend_excluded_cargo, i - 3)) w->LowerWidget(i);
+			w->DrawWidgets();
-		}
-		break;
+			int x = 495;
-	}
+			int y = 24;
-	case WE_PAINT: {
+			gd.excluded_data = _legend_excluded_cargo;
-		int j, x, y;
+			gd.left = 2;
-		CargoID i;
+			gd.top = 24;
-		GraphDrawer gd;
+			gd.height = w->Height() - 38;
+			gd.has_negative_values = false;
-		w->DrawWidgets();
+			gd.format_str_y_axis = STR_CURRCOMPACT;
+			gd.num_on_x_axis = 20;
-		x = 495;
+			gd.num_vert_lines = 20;
-		y = 24;
+			gd.month = 0xFF;
+			gd.x_values_start     = 10;
-		gd.excluded_data = _legend_excluded_cargo;
+			gd.x_values_increment = 10;
-		gd.left = 2;
-		gd.top = 24;
+			uint i = 0;
-		gd.height = 104;
+			for (CargoID c = 0; c != NUM_CARGO; c++) {
-		gd.has_negative_values = false;
+				const CargoSpec *cs = GetCargo(c);
-		gd.format_str_y_axis = STR_CURRCOMPACT;
+				if (!cs->IsValid()) continue;
-		gd.num_dataset = NUM_CARGO;
-		gd.num_on_x_axis = 20;
+				/* Only draw labels for widgets that exist. If the widget doesn't
-		gd.num_vert_lines = 20;
+				 * exist then the local player has used the climate cheat or
-		gd.month = 0xFF;
+				 * changed the NewGRF configuration with this window open. */
-		gd.x_values_start     = 10;
+				if (i + 3 < w->widget_count) {
-		gd.x_values_increment = 10;
+					/* Since the buttons have no text, no images,
+					 * both the text and the colored box have to be manually painted.
-		for (i = 0; i != NUM_CARGO; i++) {
+					 * clk_dif will move one pixel down and one pixel to the right
-			/* Since the buttons have no text, no images,
+					 * when the button is clicked */
-			 * both the text and the colored box have to be manually painted.
+					byte clk_dif = w->IsWidgetLowered(i + 3) ? 1 : 0;
-			 * clk_dif will move one pixel down and one pixel to the right
-			 * when the button is clicked */
+					GfxFillRect(x + clk_dif, y + clk_dif, x + 8 + clk_dif, y + 5 + clk_dif, 0);
-			byte clk_dif = w->IsWidgetLowered(i + 3) ? 1 : 0;
+					GfxFillRect(x + 1 + clk_dif, y + 1 + clk_dif, x + 7 + clk_dif, y + 4 + clk_dif, cs->legend_colour);
-			const CargoSpec *cs = GetCargo(i);
+					SetDParam(0, cs->name);
+					DrawString(x + 14 + clk_dif, y + clk_dif, STR_7065, 0);
-			GfxFillRect(x + clk_dif, y + clk_dif, x + 8 + clk_dif, y + 5 + clk_dif, 0);
+					y += 8;
-			GfxFillRect(x + 1 + clk_dif, y + 1 + clk_dif, x + 7 + clk_dif, y + 4 + clk_dif, cs->legend_colour);
+				}
-			SetDParam(0, cs->name != 0 ? cs->name : (StringID)STR_EMPTY);
-			DrawString(x + 14 + clk_dif, y + clk_dif, STR_7065, 0);
+				gd.colors[i] = cs->legend_colour;
-			y += 8;
+				for (uint j = 0; j != 20; j++) {
-			gd.colors[i] = cs->legend_colour;
+					gd.cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 6 + 6, c);
-			for (j = 0; j != 20; j++) {
+				}
-				gd.cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 6 + 6, i);
-			}
+				i++;
-		}
+			}
+			gd.num_dataset = i;
-		DrawGraph(&gd);
+			DrawGraph(&gd);
-		DrawString(2 + 46, 24 + gd.height + 7, STR_7062_DAYS_IN_TRANSIT, 0);
-		DrawString(2 + 84, 24 - 9, STR_7063_PAYMENT_FOR_DELIVERING, 0);
+			DrawString(2 + 46, 24 + gd.height + 7, STR_7062_DAYS_IN_TRANSIT, 0);
-	} break;
+			DrawString(2 + 84, 24 - 9, STR_7063_PAYMENT_FOR_DELIVERING, 0);
+			break;
-	case WE_CLICK: {
+		}
-		switch (e->we.click.widget) {
-		case 3: case 4: case 5: case 6:
+		case WE_CLICK:
-		case 7: case 8: case 9: case 10:
+			if (e->we.click.widget >= 3) {
-		case 11: case 12: case 13: case 14:
+				TOGGLEBIT(_legend_excluded_cargo, e->we.click.widget - 3);
-			TOGGLEBIT(_legend_excluded_cargo, e->we.click.widget - 3);
+				w->ToggleWidgetLoweredState(e->we.click.widget);
-			w->ToggleWidgetLoweredState(e->we.click.widget);
+				w->SetDirty();
-			w->SetDirty();
+			}
 			break;
-		}
-	} break;
 	}
 }
 static const OldWidget _cargo_payment_rates_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                     STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   567,     0,    13, STR_7061_CARGO_PAYMENT_RATES, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_NONE,    14,     0,   567,    14,   141, 0x0,                          STR_NULL},
+{      WWT_PANEL, RESIZE_BOTTOM,    14,     0,   567,    14,    45, 0x0,                          STR_NULL},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    24,    31, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    32,    39, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    40,    47, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    48,    55, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    56,    63, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    64,    71, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    72,    79, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    80,    87, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    88,    95, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    96,   103, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,   104,   111, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,   112,   119, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
 {   WIDGETS_END},
 };
 static const WindowDesc _cargo_payment_rates_desc = {
-	WDP_AUTO, WDP_AUTO, 568, 142,
+	WDP_AUTO, WDP_AUTO, 568, 46,
 	WC_PAYMENT_RATES, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_cargo_payment_rates_widgets,
 	CargoPaymentRatesWndProc
 };
 void ShowCargoPaymentRates(void)
 {
-	BaseWindow::AllocateFront(&_cargo_payment_rates_desc, 0);
+	BaseWindow *w = BaseWindow::AllocateFront(&_cargo_payment_rates_desc, 0);
+	if (w == NULL) return;
+	/* Count the number of active cargo types */
+	uint num_active = 0;
+	for (CargoID c = 0; c != NUM_CARGO; c++) {
+		if (GetCargo(c)->IsValid()) num_active++;
+	}
+	/* Resize the window to fit the cargo types */
+	w->Resize(0, num_active * 8);
+	/* Add widgets for each cargo type */
+	w->widget_count = 3 + num_active;
+	w->widget = ReallocT(w->widget, w->widget_count);
+	/* Set the properties of each widget */
+	for (uint i = 0; i != num_active; i++) {
+		OldWidget *wi = &w->widget[3 + i];
+		wi->type     = WWT_PANEL;
+		wi->m_display_flags = RESIZE_NONE;
+		wi->color    = 12;
+		wi->left     = 493;
+		wi->right    = 562;
+		wi->top      = 24 + i * 8;
+		wi->bottom   = wi->top + 7;
+		wi->data     = 0;
+		wi->tooltips = STR_7064_TOGGLE_GRAPH_FOR_CARGO;
+		if (!HASBIT(_legend_excluded_cargo, i)) w->LowerWidget(i + 3);
+	}
+	w->SetDirty();
 }
 /************************/
 /* COMPANY LEAGUE TABLE */
 /************************/
 {
 	switch (e->event) {
 		case WE_PAINT: {
 			const Player* plist[MAX_PLAYERS];
 			const Player* p;
-			uint pl_num;
-			uint i;
 			w->DrawWidgets();
-			pl_num = 0;
+			uint pl_num = 0;
 			FOR_ALL_PLAYERS(p) if (p->is_active) plist[pl_num++] = p;
 			qsort((void*)plist, pl_num, sizeof(*plist), PerfHistComp);
-			for (i = 0; i != pl_num; i++) {
+			for (uint i = 0; i != pl_num; i++) {
 				p = plist[i];
 				SetDParam(0, i + STR_01AC_1ST);
 				SetDParam(1, p->name_1);
 				SetDParam(2, p->name_2);
 				SetDParam(3, GetPlayerNameString(p->index, 4));
 			byte x;
 			uint16 y = 14;
 			int total_score = 0;
 			int color_done, color_notdone;
-			// Draw standard stuff
+			/* Draw standard stuff */
 			w->DrawWidgets();
 			/* Check if the currently selected player is still active. */
 			if (_performance_rating_detail_player == INVALID_PLAYER || !GetPlayer(_performance_rating_detail_player)->is_active) {
 				if (_performance_rating_detail_player != INVALID_PLAYER) {
 			}
 			/* If there are no active players, don't display anything else. */
 			if (_performance_rating_detail_player == INVALID_PLAYER) break;
-			// Paint the player icons
+			/* Paint the player icons */
 			for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
 				if (!GetPlayer(i)->is_active) {
-					// Check if we have the player as an active player
+					/* Check if we have the player as an active player */
 					if (!w->IsWidgetDisabled(i + 13)) {
-						// Bah, player gone :(
+						/* Bah, player gone :( */
 						w->DisableWidget(i + 13);
-						// We need a repaint
+						/* We need a repaint */
 						w->SetDirty();
 					}
 					continue;
 				}
-				// Check if we have the player marked as inactive
+				/* Check if we have the player marked as inactive */
 				if (w->IsWidgetDisabled(i + 13)) {
-					// New player! Yippie :p
+					/* New player! Yippie :p */
 					w->EnableWidget(i + 13);
-					// We need a repaint
+					/* We need a repaint */
 					w->SetDirty();
 				}
 				x = (i == _performance_rating_detail_player) ? 1 : 0;
 				DrawPlayerIcon(i, i * 37 + 13 + x, 16 + x);
 			}
-			// The colors used to show how the progress is going
+			/* The colors used to show how the progress is going */
 			color_done = _colour_gradient[COLOUR_GREEN][4];
 			color_notdone = _colour_gradient[COLOUR_RED][4];
-			// Draw all the score parts
+			/* Draw all the score parts */
 			for (ScoreID i = SCORE_BEGIN; i < SCORE_END; i++) {
 				int val    = _score_part[_performance_rating_detail_player][i];
 				int needed = _score_info[i].needed;
 				int score  = _score_info[i].score;
 				y += 20;
-				// SCORE_TOTAL has his own rulez ;)
+				/* SCORE_TOTAL has his own rulez ;) */
 				if (i == SCORE_TOTAL) {
 					needed = total_score;
 					score = SCORE_MAX;
 				} else {
 					total_score += score;
 				}
 				DrawString(7, y, STR_PERFORMANCE_DETAIL_VEHICLES + i, 0);
-				// Draw the score
+				/* Draw the score */
 				SetDParam(0, score);
 				DrawStringRightAligned(107, y, SET_PERFORMANCE_DETAIL_INT, 0);
-				// Calculate the %-bar
+				/* Calculate the %-bar */
 				if (val > needed) {
 					x = 50;
 				} else if (val == 0) {
 					x = 0;
 				} else {
 					x = val * 50 / needed;
 				}
-				// SCORE_LOAN is inversed
+				/* SCORE_LOAN is inversed */
 				if (val < 0 && i == SCORE_LOAN) x = 0;
-				// Draw the bar
+				/* Draw the bar */
 				if (x !=  0) GfxFillRect(112,     y - 2, 112 + x,  y + 10, color_done);
 				if (x != 50) GfxFillRect(112 + x, y - 2, 112 + 50, y + 10, color_notdone);
-				// Calculate the %
+				/* Calculate the % */
 				x = (val <= needed) ? val * 100 / needed : 100;
-				// SCORE_LOAN is inversed
+				/* SCORE_LOAN is inversed */
 				if (val < 0 && i == SCORE_LOAN) x = 0;
-				// Draw it
+				/* Draw it */
 				SetDParam(0, x);
 				DrawStringCentered(137, y, STR_PERFORMANCE_DETAIL_PERCENT, 0);
-				// SCORE_LOAN is inversed
+				/* SCORE_LOAN is inversed */
 				if (i == SCORE_LOAN) val = needed - val;
-				// Draw the amount we have against what is needed
+				/* Draw the amount we have against what is needed
-				//  For some of them it is in currency format
+				 * For some of them it is in currency format */
 				SetDParam(0, val);
 				SetDParam(1, needed);
 				switch (i) {
 					case SCORE_MIN_PROFIT:
 					case SCORE_MIN_INCOME:
 			break;
 		}
 		case WE_CLICK:
-			// Check which button is clicked
+			/* Check which button is clicked */
 			if (IS_INT_INSIDE(e->we.click.widget, 13, 21)) {
-				// Is it no on disable?
+				/* Is it no on disable? */
 				if (!w->IsWidgetDisabled(e->we.click.widget)) {
 					w->RaiseWidget(_performance_rating_detail_player + 13);
 					_performance_rating_detail_player = (PlayerID)(e->we.click.widget - 13);
 					w->LowerWidget(_performance_rating_detail_player + 13);
 					w->SetDirty();
 				}
 			}
 			break;
 		case WE_CREATE: {
-			PlayerID i;
 			Player *p2;
 			/* Disable the players who are not active */
-			for (i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
+			for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
 				w->SetWidgetDisabledState(i + 13, !GetPlayer(i)->is_active);
 			}
 			/* Update all player stats with the current data
 			 * (this is because _score_info is not saved to a savegame) */
 			FOR_ALL_PLAYERS(p2) {
 			w->SetDirty();
 			break;
 		}
-		case WE_TICK: {
+		case WE_TICK:
-			// Update the player score every 5 days
+			/* Update the player score every 5 days */
 			if (--w->custom[0] == 0) {
 				w->custom[0] = DAY_TICKS;
 				if (--w->custom[1] == 0) {
 					Player *p2;
 					w->custom[1] = 5;
 					FOR_ALL_PLAYERS(p2) {
-						// Skip if player is not active
+						/* Skip if player is not active */
 						if (p2->is_active) UpdateCompanyRatingAndValue(p2, false);
 					}
 					w->SetDirty();
 				}
 			}
 			break;
-		}
 	}
 }
 static const OldWidget _performance_rating_detail_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,               STR_018B_CLOSE_WINDOW},

branch	cpp_gui
changeset 6285	187e3ef04cc9
parent 6268	4b5241e5dd10
child 6298	c30fe89622df