openttd-mini: comparison graph

equal deleted inserted replaced

-:1b9163f2e7eb
+:95a0d4edb544
 #include "gui.h"
 #include "gfx.h"
 #include "player.h"
 #include "economy.h"
-static uint _legend_showbits;
+static uint _legend_excludebits;
 static uint _legend_cargobits;
 /************************/
 /* GENERIC GRAPH DRAWER */
 /************************/
 enum {GRAPH_NUM = 16};
 typedef struct GraphDrawer {
-	uint sel;
+	uint sel; // bitmask of the players *excluded* (e.g. 11111111 means that no players are shown)
 	byte num_dataset;
 	byte num_on_x_axis;
 	byte month;
 	byte year;
 	bool include_neg;
 	}
 	/* draw lines and dots */
 	i = 0;
 	row_ptr = gw->cost[0];
-	sel = gw->sel; // show only selected lines. GraphDrawer qw->sel set in Graph-Legend (_legend_showbits)
+	sel = gw->sel; // show only selected lines. GraphDrawer qw->sel set in Graph-Legend (_legend_excludebits)
 	do {
 		if (!(sel & 1)) {
 			x = gw->left + 55;
 			j = gw->num_on_x_axis;assert(j>0);
 			col_ptr = row_ptr;
 	switch(e->event) {
 	case WE_PAINT:
 		FOR_ALL_PLAYERS(p) {
 			if (!p->is_active)
-				SETBIT(_legend_showbits, p->index);
+				SETBIT(_legend_excludebits, p->index);
 		}
-		w->click_state = ((~_legend_showbits) << 3);
+		w->click_state = ((~_legend_excludebits) << 3);
 		DrawWindowWidgets(w);
 		FOR_ALL_PLAYERS(p) {
 			if (!p->is_active)
 				continue;
 			DrawPlayerIcon(p->index, 4, 18+p->index*12);
 			SetDParam(0, p->name_1);
 			SetDParam(1, p->name_2);
 			SetDParam(2, GetPlayerNameString(p->index, 3));
-			DrawString(21,17+p->index*12,STR_7021,HASBIT(_legend_showbits, p->index) ? 0x10 : 0xC);
+			DrawString(21,17+p->index*12,STR_7021,HASBIT(_legend_excludebits, p->index) ? 0x10 : 0xC);
 		}
 		break;
 	case WE_CLICK:
 		if (IS_INT_INSIDE(e->click.widget, 3, 11)) {
-			_legend_showbits ^= (1 << (e->click.widget-3));
+			_legend_excludebits ^= (1 << (e->click.widget-3));
 			SetWindowDirty(w);
 			InvalidateWindow(WC_INCOME_GRAPH, 0);
 			InvalidateWindow(WC_OPERATING_PROFIT, 0);
 			InvalidateWindow(WC_DELIVERED_CARGO, 0);
 			InvalidateWindow(WC_PERFORMANCE_HISTORY, 0);
 /********************/
 static void SetupGraphDrawerForPlayers(GraphDrawer *gd)
 {
 	Player *p;
-	uint showbits = _legend_showbits;
+	uint excludebits = _legend_excludebits;
 	int nums;
 	int mo,yr;
 	// Exclude the players which aren't valid
 	FOR_ALL_PLAYERS(p) {
-		if (!p->is_active) CLRBIT(showbits,p->index);
+		if (!p->is_active) SETBIT(excludebits,p->index);
 	}
-	gd->sel = showbits;
+	gd->sel = excludebits;
 	gd->num_vert_lines = 24;
 	nums = 0;
 	FOR_ALL_PLAYERS(p) {
 		if (p->is_active) nums = max(nums,p->num_valid_stat_ent);
 		gd.color_2 = 0xD7;
 		gd.bg_line_color = 0xE;
 		SetupGraphDrawerForPlayers(&gd);
-		numd = 0;
+		numd = -1;
 		FOR_ALL_PLAYERS(p) {
+			numd++;
 			if (!p->is_active)
 				continue;
 			gd.colors[numd] = _color_list[p->player_color].window_color_bgb;
 			for(j=gd.num_on_x_axis,i=0; --j >= 0;) {
 				gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_VALUE : (uint64)(p->old_economy[j].income + p->old_economy[j].expenses);
 				i++;
 			}
-			numd++;
 		}
 		gd.num_dataset=numd;
 		DrawGraph(&gd);
 	}	break;
 void ShowOperatingProfitGraph()
 {
 	if (AllocateWindowDescFront(&_operating_profit_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-		_legend_showbits = 0;
 	}
 }
 /****************/
 		gd.color_3 = 0x10;
 		gd.color_2 = 0xD7;
 		gd.bg_line_color = 0xE;
 		SetupGraphDrawerForPlayers(&gd);
-		numd = 0;
+		numd = -1;
 		FOR_ALL_PLAYERS(p) {
+			numd++;
 			if (!p->is_active)
 				continue;
 			gd.colors[numd] = _color_list[p->player_color].window_color_bgb;
 			for(j=gd.num_on_x_axis,i=0; --j >= 0;) {
 				gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_VALUE : (uint64)p->old_economy[j].income;
 				i++;
 			}
-			numd++;
 		}
 		gd.num_dataset = numd;
 		DrawGraph(&gd);
 void ShowIncomeGraph()
 {
 	if (AllocateWindowDescFront(&_income_graph_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-		_legend_showbits = 0;
 	}
 }
 /*******************/
 /* DELIVERED CARGO */
 		gd.color_3 = 0x10;
 		gd.color_2 = 0xD7;
 		gd.bg_line_color = 0xE;
 		SetupGraphDrawerForPlayers(&gd);
-		numd = 0;
+		numd = -1;
 		FOR_ALL_PLAYERS(p) {
+			numd++;
 			if (!p->is_active)
 				continue;
 			gd.colors[numd] = _color_list[p->player_color].window_color_bgb;
 			for(j=gd.num_on_x_axis,i=0; --j >= 0;) {
 				gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_VALUE : (uint64)p->old_economy[j].delivered_cargo;
 				i++;
 			}
-			numd++;
 		}
 		gd.num_dataset = numd;
 		DrawGraph(&gd);
 void ShowDeliveredCargoGraph()
 {
 	if (AllocateWindowDescFront(&_delivered_cargo_graph_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-		_legend_showbits = 0;
 	}
 }
 /*****************************/
 /* PERFORMANCE RATING DETAIL */
 		gd.color_3 = 0x10;
 		gd.color_2 = 0xD7;
 		gd.bg_line_color = 0xE;
 		SetupGraphDrawerForPlayers(&gd);
-		numd = 0;
+		numd = -1;
 		FOR_ALL_PLAYERS(p) {
+			numd++;
 			if (!p->is_active)
 				continue;
 			gd.colors[numd] = _color_list[p->player_color].window_color_bgb;
 			for(j=gd.num_on_x_axis,i=0; --j >= 0;) {
 				gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_VALUE : (uint64)p->old_economy[j].performance_history;
 				i++;
 			}
-			numd++;
 		}
 		gd.num_dataset = numd;
 		DrawGraph(&gd);
 		break;
 void ShowPerformanceHistoryGraph()
 {
 	if (AllocateWindowDescFront(&_performance_history_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-		_legend_showbits = 0;
 	}
 }
 /*****************/
 /* COMPANY VALUE */
 		gd.color_3 = 0x10;
 		gd.color_2 = 0xD7;
 		gd.bg_line_color = 0xE;
 		SetupGraphDrawerForPlayers(&gd);
-		numd = 0;
+		numd = -1;
 		FOR_ALL_PLAYERS(p) {
+			numd++;
 			if (!p->is_active)
 				continue;
 			gd.colors[numd] = _color_list[p->player_color].window_color_bgb;
 			for(j=gd.num_on_x_axis,i=0; --j >= 0;) {
 				gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_VALUE : (uint64)p->old_economy[j].company_value;
 				i++;
 			}
-			numd++;
 		}
 		gd.num_dataset = numd;
 		DrawGraph(&gd);
 void ShowCompanyValueGraph()
 {
 	if (AllocateWindowDescFront(&_company_value_graph_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-		_legend_showbits = 0;
 	}
 }
 /*****************/
 /* PAYMENT RATES */

changeset 1079	95a0d4edb544
parent 983	4765bf636f6b
child 1085	56facccb1f3d