author | truelight |
Sun, 25 Mar 2007 23:51:30 +0000 | |
branch | noai |
changeset 9545 | 179f651eb116 |
parent 9505 | 9711235f5693 |
child 6719 | 4cc327ad39d5 |
child 6959 | 0066ab0d9b93 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
3 |
/** @file graph_gui.cpp */ |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1575
diff
changeset
|
6 |
#include "openttd.h" |
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
410
diff
changeset
|
7 |
#include "table/strings.h" |
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
8 |
#include "table/sprites.h" |
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
9 |
#include "functions.h" |
0 | 10 |
#include "window.h" |
11 |
#include "gui.h" |
|
12 |
#include "gfx.h" |
|
13 |
#include "player.h" |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
14 |
#include "economy.h" |
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2135
diff
changeset
|
15 |
#include "variables.h" |
4261
2ec8f5a9747b
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
3801
diff
changeset
|
16 |
#include "date.h" |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
17 |
#include "helpers.hpp" |
6417
26acff62d001
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
peter1138
parents:
6197
diff
changeset
|
18 |
#include "cargotype.h" |
5291
5e4d9ab3cc0f
(svn r7444) -Codechange: Use one (global) cargo-colours array for drawing cargo-colours. Change Food
Darkvater
parents:
5247
diff
changeset
|
19 |
|
6057
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
20 |
/* Bitmasks of player and cargo indices that shouldn't be drawn. */ |
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
21 |
static uint _legend_excluded_players; |
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
22 |
static uint _legend_excluded_cargo; |
0 | 23 |
|
24 |
/************************/ |
|
25 |
/* GENERIC GRAPH DRAWER */ |
|
26 |
/************************/ |
|
27 |
||
6019
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
28 |
enum { |
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
29 |
GRAPH_MAX_DATASETS = 16, |
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
30 |
GRAPH_AXIS_LABEL_COLOUR = 16, |
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
31 |
GRAPH_AXIS_LINE_COLOUR = 215, |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
32 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
33 |
GRAPH_X_POSITION_BEGINNING = 44, ///< Start the graph 44 pixels from gw->left |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
34 |
GRAPH_X_POSITION_SEPARATION = 22, ///< There are 22 pixels between each X value |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
35 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
36 |
GRAPH_NUM_LINES_Y = 9, ///< How many horizontal lines to draw. |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
37 |
/* 9 is convenient as that means the distance between them is the height of the graph / 8, |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
38 |
* which is the same |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
39 |
* as height >> 3. */ |
6019
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
40 |
}; |
236
da0ae9d977e0
(svn r237) -Fix: [1025836] Company value problem (again). Now company value rightly shows the value, including ALL your money.
darkvater
parents:
222
diff
changeset
|
41 |
|
6056
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
42 |
/* Apparently these don't play well with enums. */ |
6063
5b597c73dbfb
(svn r8374) -Fix (r8367): LLONG_MAX isn't always defined, and INT64_MAX describes the
maedhros
parents:
6058
diff
changeset
|
43 |
static const int64 INVALID_DATAPOINT = INT64_MAX; // Value used for a datapoint that shouldn't be drawn. |
6056
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
44 |
static const uint INVALID_DATAPOINT_POS = UINT_MAX; // Used to determine if the previous point was drawn. |
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
45 |
|
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
46 |
struct GraphDrawer { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
47 |
uint excluded_data; ///< bitmask of the datasets that shouldn't be displayed. |
0 | 48 |
byte num_dataset; |
49 |
byte num_on_x_axis; |
|
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
50 |
bool has_negative_values; |
6022
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
51 |
byte num_vert_lines; |
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
52 |
|
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
53 |
/* The starting month and year that values are plotted against. If month is |
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
54 |
* 0xFF, use x_values_start and x_values_increment below instead. */ |
0 | 55 |
byte month; |
4293
2c24234a7aec
(svn r5926) -Codechange: make _cur_year contain the full year, instead of the offset since 1920
rubidium
parents:
4286
diff
changeset
|
56 |
Year year; |
6022
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
57 |
|
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
58 |
/* These values are used if the graph is being plotted against values |
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
59 |
* rather than the dates specified by month and year. */ |
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
60 |
uint16 x_values_start; |
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
61 |
uint16 x_values_increment; |
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
62 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
63 |
int left, top; ///< Where to start drawing the graph, in pixels. |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
64 |
uint height; ///< The height of the graph in pixels. |
0 | 65 |
StringID format_str_y_axis; |
6019
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
66 |
byte colors[GRAPH_MAX_DATASETS]; |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
67 |
int64 cost[GRAPH_MAX_DATASETS][24]; ///< last 2 years |
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
68 |
}; |
0 | 69 |
|
2436
177cb6a8339f
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2261
diff
changeset
|
70 |
static void DrawGraph(const GraphDrawer *gw) |
0 | 71 |
{ |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
72 |
uint x, y; ///< Reused whenever x and y coordinates are needed. |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
73 |
int64 highest_value; ///< Highest value to be drawn. |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
74 |
int x_axis_offset; ///< Distance from the top of the graph to the x axis. |
0 | 75 |
|
240 | 76 |
/* the colors and cost array of GraphDrawer must accomodate |
236
da0ae9d977e0
(svn r237) -Fix: [1025836] Company value problem (again). Now company value rightly shows the value, including ALL your money.
darkvater
parents:
222
diff
changeset
|
77 |
* both values for cargo and players. So if any are higher, quit */ |
6019
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
78 |
assert(GRAPH_MAX_DATASETS >= (int)NUM_CARGO && GRAPH_MAX_DATASETS >= (int)MAX_PLAYERS); |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
79 |
assert(gw->num_vert_lines > 0); |
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
80 |
|
6017
2b6446e2deff
(svn r8317) -Codechange: Remove GraphDrawer::bg_line_color since it was the same everywhere it was set.
maedhros
parents:
6012
diff
changeset
|
81 |
byte grid_colour = _colour_gradient[14][4]; |
0 | 82 |
|
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
83 |
/* The coordinates of the opposite edges of the graph. */ |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
84 |
int bottom = gw->top + gw->height - 1; |
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
85 |
int right = gw->left + GRAPH_X_POSITION_BEGINNING + gw->num_vert_lines * GRAPH_X_POSITION_SEPARATION - 1; |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
86 |
|
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
87 |
/* Draw the vertical grid lines. */ |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
88 |
|
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
89 |
/* Don't draw the first line, as that's where the axis will be. */ |
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
90 |
x = gw->left + GRAPH_X_POSITION_BEGINNING + GRAPH_X_POSITION_SEPARATION; |
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
91 |
|
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
92 |
for (int i = 0; i < gw->num_vert_lines; i++) { |
6017
2b6446e2deff
(svn r8317) -Codechange: Remove GraphDrawer::bg_line_color since it was the same everywhere it was set.
maedhros
parents:
6012
diff
changeset
|
93 |
GfxFillRect(x, gw->top, x, bottom, grid_colour); |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
94 |
x += GRAPH_X_POSITION_SEPARATION; |
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
95 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
96 |
|
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
97 |
/* Draw the horizontal grid lines. */ |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
98 |
x = gw->left + GRAPH_X_POSITION_BEGINNING; |
0 | 99 |
y = gw->height + gw->top; |
100 |
||
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
101 |
for (int i = 0; i < GRAPH_NUM_LINES_Y; i++) { |
6017
2b6446e2deff
(svn r8317) -Codechange: Remove GraphDrawer::bg_line_color since it was the same everywhere it was set.
maedhros
parents:
6012
diff
changeset
|
102 |
GfxFillRect(x, y, right, y, grid_colour); |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
103 |
y -= (gw->height / (GRAPH_NUM_LINES_Y - 1)); |
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
104 |
} |
0 | 105 |
|
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
106 |
/* Draw the y axis. */ |
6019
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
107 |
GfxFillRect(x, gw->top, x, bottom, GRAPH_AXIS_LINE_COLOUR); |
0 | 108 |
|
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
109 |
/* Find the distance from the top of the graph to the x axis. */ |
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
110 |
x_axis_offset = gw->height; |
0 | 111 |
|
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
112 |
/* The graph is currently symmetrical about the x axis. */ |
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
113 |
if (gw->has_negative_values) x_axis_offset /= 2; |
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
114 |
|
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
115 |
/* Draw the x axis. */ |
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
116 |
y = x_axis_offset + gw->top; |
6019
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
117 |
GfxFillRect(x, y, right, y, GRAPH_AXIS_LINE_COLOUR); |
0 | 118 |
|
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
119 |
/* Find the largest value that will be drawn. */ |
0 | 120 |
if (gw->num_on_x_axis == 0) |
121 |
return; |
|
122 |
||
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
123 |
assert(gw->num_on_x_axis > 0); |
6029
3db5cfc1ee92
(svn r8330) -Codechange: Remove num_x and num_dataset from DrawGraph.
maedhros
parents:
6028
diff
changeset
|
124 |
assert(gw->num_dataset > 0); |
236
da0ae9d977e0
(svn r237) -Fix: [1025836] Company value problem (again). Now company value rightly shows the value, including ALL your money.
darkvater
parents:
222
diff
changeset
|
125 |
|
6055
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
126 |
/* Start of with a value of twice the height of the graph in pixels. It's a |
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
127 |
* bit arbitrary, but it makes the cargo payment graph look a little nicer, |
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
128 |
* and prevents division by zero when calculating where the datapoint |
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
129 |
* should be drawn. */ |
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
130 |
highest_value = x_axis_offset * 2; |
6047
a69bc9a0b6ec
(svn r8356) -Codechange: [Graphs] Rename mx to highest_value, and fix the scaling for negative values.
maedhros
parents:
6044
diff
changeset
|
131 |
|
6029
3db5cfc1ee92
(svn r8330) -Codechange: Remove num_x and num_dataset from DrawGraph.
maedhros
parents:
6028
diff
changeset
|
132 |
for (int i = 0; i < gw->num_dataset; i++) { |
6057
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
133 |
if (!HASBIT(gw->excluded_data, i)) { |
6042
1a7b67e2afd2
(svn r8347) -Codechange: [Graphs] Make some more variables local to the loops they're used in, and remove some assumptions about the size of an array.
maedhros
parents:
6029
diff
changeset
|
134 |
for (int j = 0; j < gw->num_on_x_axis; j++) { |
1a7b67e2afd2
(svn r8347) -Codechange: [Graphs] Make some more variables local to the loops they're used in, and remove some assumptions about the size of an array.
maedhros
parents:
6029
diff
changeset
|
135 |
int64 datapoint = gw->cost[i][j]; |
1a7b67e2afd2
(svn r8347) -Codechange: [Graphs] Make some more variables local to the loops they're used in, and remove some assumptions about the size of an array.
maedhros
parents:
6029
diff
changeset
|
136 |
|
6056
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
137 |
if (datapoint != INVALID_DATAPOINT) { |
6047
a69bc9a0b6ec
(svn r8356) -Codechange: [Graphs] Rename mx to highest_value, and fix the scaling for negative values.
maedhros
parents:
6044
diff
changeset
|
138 |
/* For now, if the graph has negative values the scaling is |
a69bc9a0b6ec
(svn r8356) -Codechange: [Graphs] Rename mx to highest_value, and fix the scaling for negative values.
maedhros
parents:
6044
diff
changeset
|
139 |
* symmetrical about the x axis, so take the absolute value |
a69bc9a0b6ec
(svn r8356) -Codechange: [Graphs] Rename mx to highest_value, and fix the scaling for negative values.
maedhros
parents:
6044
diff
changeset
|
140 |
* of each data point. */ |
a69bc9a0b6ec
(svn r8356) -Codechange: [Graphs] Rename mx to highest_value, and fix the scaling for negative values.
maedhros
parents:
6044
diff
changeset
|
141 |
highest_value = max(highest_value, myabs(datapoint)); |
236
da0ae9d977e0
(svn r237) -Fix: [1025836] Company value problem (again). Now company value rightly shows the value, including ALL your money.
darkvater
parents:
222
diff
changeset
|
142 |
} |
6029
3db5cfc1ee92
(svn r8330) -Codechange: Remove num_x and num_dataset from DrawGraph.
maedhros
parents:
6028
diff
changeset
|
143 |
} |
236
da0ae9d977e0
(svn r237) -Fix: [1025836] Company value problem (again). Now company value rightly shows the value, including ALL your money.
darkvater
parents:
222
diff
changeset
|
144 |
} |
6029
3db5cfc1ee92
(svn r8330) -Codechange: Remove num_x and num_dataset from DrawGraph.
maedhros
parents:
6028
diff
changeset
|
145 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
146 |
|
6055
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
147 |
/* Round up highest_value so that it will divide cleanly into the number of |
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
148 |
* axis labels used. */ |
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
149 |
int round_val = highest_value % (GRAPH_NUM_LINES_Y - 1); |
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
150 |
if (round_val != 0) highest_value += (GRAPH_NUM_LINES_Y - 1 - round_val); |
0 | 151 |
|
152 |
/* draw text strings on the y axis */ |
|
6055
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
153 |
int64 y_label = highest_value; |
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
154 |
int64 y_label_separation = highest_value / (GRAPH_NUM_LINES_Y - 1); |
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
155 |
|
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
156 |
/* If there are negative values, the graph goes from highest_value to |
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
157 |
* -highest_value, not highest_value to 0. */ |
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
158 |
if (gw->has_negative_values) y_label_separation *= 2; |
6055
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
159 |
|
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
160 |
x = gw->left + GRAPH_X_POSITION_BEGINNING + 1; |
0 | 161 |
y = gw->top - 3; |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
162 |
|
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
163 |
for (int i = 0; i < GRAPH_NUM_LINES_Y; i++) { |
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
519
diff
changeset
|
164 |
SetDParam(0, gw->format_str_y_axis); |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
165 |
SetDParam64(1, y_label); |
6019
e244cd8e301a
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
maedhros
parents:
6017
diff
changeset
|
166 |
DrawStringRightAligned(x, y, STR_0170, GRAPH_AXIS_LABEL_COLOUR); |
6055
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
167 |
|
4ac2b6bfc16b
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
maedhros
parents:
6047
diff
changeset
|
168 |
y_label -= y_label_separation; |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
169 |
y += (gw->height / (GRAPH_NUM_LINES_Y - 1)); |
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
170 |
} |
0 | 171 |
|
172 |
/* draw strings on the x axis */ |
|
173 |
if (gw->month != 0xFF) { |
|
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
174 |
x = gw->left + GRAPH_X_POSITION_BEGINNING; |
0 | 175 |
y = gw->top + gw->height + 1; |
6028
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
176 |
byte month = gw->month; |
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
177 |
Year year = gw->year; |
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
178 |
for (int i = 0; i < gw->num_on_x_axis; i++) { |
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
179 |
SetDParam(0, month + STR_0162_JAN); |
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
180 |
SetDParam(1, month + STR_0162_JAN + 2); |
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
181 |
SetDParam(2, year); |
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
182 |
DrawString(x, y, month == 0 ? STR_016F : STR_016E, GRAPH_AXIS_LABEL_COLOUR); |
0 | 183 |
|
6028
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
184 |
month += 3; |
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
185 |
if (month >= 12) { |
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
186 |
month = 0; |
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
187 |
year++; |
0 | 188 |
} |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
189 |
x += GRAPH_X_POSITION_SEPARATION; |
6028
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
190 |
} |
0 | 191 |
} else { |
6044
6f03f8cab2ec
(svn r8350) -Codechange: [Graphs] Use DrawStringCentered instead of a hardcoded offset to make the string appear centred.
maedhros
parents:
6042
diff
changeset
|
192 |
/* Draw the label under the data point rather than on the grid line. */ |
6f03f8cab2ec
(svn r8350) -Codechange: [Graphs] Use DrawStringCentered instead of a hardcoded offset to make the string appear centred.
maedhros
parents:
6042
diff
changeset
|
193 |
x = gw->left + GRAPH_X_POSITION_BEGINNING + (GRAPH_X_POSITION_SEPARATION / 2) + 1; |
0 | 194 |
y = gw->top + gw->height + 1; |
6022
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
195 |
uint16 label = gw->x_values_start; |
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
196 |
|
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
197 |
for (int i = 0; i < gw->num_on_x_axis; i++) { |
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
198 |
SetDParam(0, label); |
6044
6f03f8cab2ec
(svn r8350) -Codechange: [Graphs] Use DrawStringCentered instead of a hardcoded offset to make the string appear centred.
maedhros
parents:
6042
diff
changeset
|
199 |
DrawStringCentered(x, y, STR_01CB, GRAPH_AXIS_LABEL_COLOUR); |
6f03f8cab2ec
(svn r8350) -Codechange: [Graphs] Use DrawStringCentered instead of a hardcoded offset to make the string appear centred.
maedhros
parents:
6042
diff
changeset
|
200 |
|
6022
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
201 |
label += gw->x_values_increment; |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
202 |
x += GRAPH_X_POSITION_SEPARATION; |
6022
69bdaeb96df0
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
maedhros
parents:
6019
diff
changeset
|
203 |
} |
0 | 204 |
} |
205 |
||
206 |
/* draw lines and dots */ |
|
6028
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
207 |
for (int i = 0; i < gw->num_dataset; i++) { |
6057
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
208 |
if (!HASBIT(gw->excluded_data, i)) { |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
209 |
/* Centre the dot between the grid lines. */ |
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
210 |
x = gw->left + GRAPH_X_POSITION_BEGINNING + (GRAPH_X_POSITION_SEPARATION / 2); |
6042
1a7b67e2afd2
(svn r8347) -Codechange: [Graphs] Make some more variables local to the loops they're used in, and remove some assumptions about the size of an array.
maedhros
parents:
6029
diff
changeset
|
211 |
|
6056
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
212 |
byte color = gw->colors[i]; |
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
213 |
uint prev_x = INVALID_DATAPOINT_POS; |
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
214 |
uint prev_y = INVALID_DATAPOINT_POS; |
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
215 |
|
6042
1a7b67e2afd2
(svn r8347) -Codechange: [Graphs] Make some more variables local to the loops they're used in, and remove some assumptions about the size of an array.
maedhros
parents:
6029
diff
changeset
|
216 |
for (int j = 0; j < gw->num_on_x_axis; j++) { |
1a7b67e2afd2
(svn r8347) -Codechange: [Graphs] Make some more variables local to the loops they're used in, and remove some assumptions about the size of an array.
maedhros
parents:
6029
diff
changeset
|
217 |
int64 datapoint = gw->cost[i][j]; |
1a7b67e2afd2
(svn r8347) -Codechange: [Graphs] Make some more variables local to the loops they're used in, and remove some assumptions about the size of an array.
maedhros
parents:
6029
diff
changeset
|
218 |
|
6056
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
219 |
if (datapoint != INVALID_DATAPOINT) { |
6058
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
220 |
/* XXX: This can overflow if x_axis_offset * datapoint is |
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
221 |
* too big to fit in an int64. */ |
3ee339c612d1
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
maedhros
parents:
6057
diff
changeset
|
222 |
y = gw->top + x_axis_offset - (x_axis_offset * datapoint) / highest_value; |
0 | 223 |
|
6056
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
224 |
/* Draw the point. */ |
0 | 225 |
GfxFillRect(x-1, y-1, x+1, y+1, color); |
226 |
||
6056
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
227 |
/* Draw the line connected to the previous point. */ |
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
228 |
if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, color); |
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
229 |
|
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
230 |
prev_x = x; |
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
231 |
prev_y = y; |
0 | 232 |
} else { |
6056
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
233 |
prev_x = INVALID_DATAPOINT_POS; |
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
234 |
prev_y = INVALID_DATAPOINT_POS; |
0 | 235 |
} |
6056
879b00467368
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
maedhros
parents:
6055
diff
changeset
|
236 |
|
6027
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
237 |
x += GRAPH_X_POSITION_SEPARATION; |
6897590574c0
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
maedhros
parents:
6022
diff
changeset
|
238 |
} |
0 | 239 |
} |
6028
5638dde4a5f6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
maedhros
parents:
6027
diff
changeset
|
240 |
} |
0 | 241 |
} |
242 |
||
243 |
/****************/ |
|
244 |
/* GRAPH LEGEND */ |
|
245 |
/****************/ |
|
246 |
||
247 |
static void GraphLegendWndProc(Window *w, WindowEvent *e) |
|
248 |
{ |
|
2952 | 249 |
switch (e->event) { |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
250 |
case WE_CREATE: |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
251 |
for (uint i = 3; i < w->widget_count; i++) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
252 |
if (!HASBIT(_legend_excluded_players, i - 3)) LowerWindowWidget(w, i); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
253 |
} |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
254 |
break; |
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
255 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
256 |
case WE_PAINT: { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
257 |
const Player *p; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
258 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
259 |
FOR_ALL_PLAYERS(p) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
260 |
if (p->is_active) continue; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
261 |
|
6057
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
262 |
SETBIT(_legend_excluded_players, p->index); |
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
263 |
RaiseWindowWidget(w, p->index + 3); |
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
264 |
} |
0 | 265 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
266 |
DrawWindowWidgets(w); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
267 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
268 |
FOR_ALL_PLAYERS(p) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
269 |
if (!p->is_active) continue; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
270 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
271 |
DrawPlayerIcon(p->index, 4, 18+p->index*12); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
272 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
273 |
SetDParam(0, p->name_1); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
274 |
SetDParam(1, p->name_2); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
275 |
SetDParam(2, GetPlayerNameString(p->index, 3)); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
276 |
DrawString(21, 17 + p->index * 12, STR_7021, HASBIT(_legend_excluded_players, p->index) ? 0x10 : 0xC); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
277 |
} |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
278 |
break; |
0 | 279 |
} |
280 |
||
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
281 |
case WE_CLICK: |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
282 |
if (!IS_INT_INSIDE(e->we.click.widget, 3, 11)) return; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
283 |
|
6057
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
284 |
TOGGLEBIT(_legend_excluded_players, e->we.click.widget - 3); |
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
285 |
ToggleWidgetLoweredState(w, e->we.click.widget); |
0 | 286 |
SetWindowDirty(w); |
287 |
InvalidateWindow(WC_INCOME_GRAPH, 0); |
|
288 |
InvalidateWindow(WC_OPERATING_PROFIT, 0); |
|
289 |
InvalidateWindow(WC_DELIVERED_CARGO, 0); |
|
290 |
InvalidateWindow(WC_PERFORMANCE_HISTORY, 0); |
|
140
b00ce8503044
(svn r141) -Fix: Company-value was not updated immediatly if legend was changed
truelight
parents:
116
diff
changeset
|
291 |
InvalidateWindow(WC_COMPANY_VALUE, 0); |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
292 |
break; |
0 | 293 |
} |
294 |
} |
|
295 |
||
296 |
static const Widget _graph_legend_widgets[] = { |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
297 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
534
diff
changeset
|
298 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 249, 0, 13, STR_704E_KEY_TO_COMPANY_GRAPHS, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
299 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 249, 14, 113, 0x0, STR_NULL}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
300 |
{ WWT_PANEL, RESIZE_NONE, 14, 2, 247, 16, 27, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
301 |
{ WWT_PANEL, RESIZE_NONE, 14, 2, 247, 28, 39, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
302 |
{ WWT_PANEL, RESIZE_NONE, 14, 2, 247, 40, 51, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
303 |
{ WWT_PANEL, RESIZE_NONE, 14, 2, 247, 52, 63, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
304 |
{ WWT_PANEL, RESIZE_NONE, 14, 2, 247, 64, 75, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
305 |
{ WWT_PANEL, RESIZE_NONE, 14, 2, 247, 76, 87, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
306 |
{ WWT_PANEL, RESIZE_NONE, 14, 2, 247, 88, 99, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
307 |
{ WWT_PANEL, RESIZE_NONE, 14, 2, 247, 100, 111, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
176
84990c4b9212
(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
darkvater
parents:
165
diff
changeset
|
308 |
{ WIDGETS_END}, |
0 | 309 |
}; |
310 |
||
311 |
static const WindowDesc _graph_legend_desc = { |
|
5070
0bbf5264bfb7
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
4938
diff
changeset
|
312 |
WDP_AUTO, WDP_AUTO, 250, 114, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
6063
diff
changeset
|
313 |
WC_GRAPH_LEGEND, WC_NONE, |
0 | 314 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, |
315 |
_graph_legend_widgets, |
|
316 |
GraphLegendWndProc |
|
317 |
}; |
|
318 |
||
6573 | 319 |
static void ShowGraphLegend() |
0 | 320 |
{ |
321 |
AllocateWindowDescFront(&_graph_legend_desc, 0); |
|
322 |
} |
|
323 |
||
324 |
/********************/ |
|
325 |
/* OPERATING PROFIT */ |
|
326 |
/********************/ |
|
327 |
||
328 |
static void SetupGraphDrawerForPlayers(GraphDrawer *gd) |
|
329 |
{ |
|
2475 | 330 |
const Player* p; |
6057
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
331 |
uint excluded_players = _legend_excluded_players; |
5852
cb3f71b16e1a
(svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max().
celestar
parents:
5838
diff
changeset
|
332 |
byte nums; |
0 | 333 |
int mo,yr; |
334 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
335 |
/* Exclude the players which aren't valid */ |
0 | 336 |
FOR_ALL_PLAYERS(p) { |
6057
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
337 |
if (!p->is_active) SETBIT(excluded_players, p->index); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
338 |
} |
6057
8f1388f239b3
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
maedhros
parents:
6056
diff
changeset
|
339 |
gd->excluded_data = excluded_players; |
0 | 340 |
gd->num_vert_lines = 24; |
341 |
||
342 |
nums = 0; |
|
343 |
FOR_ALL_PLAYERS(p) { |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
344 |
if (p->is_active) nums = max(nums, p->num_valid_stat_ent); |
0 | 345 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
346 |
gd->num_on_x_axis = min(nums, 24); |
0 | 347 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
348 |
mo = (_cur_month / 3 - nums) * 3; |
0 | 349 |
yr = _cur_year; |
350 |
while (mo < 0) { |
|
351 |
yr--; |
|
352 |
mo += 12; |
|
353 |
} |
|
354 |
||
355 |
gd->year = yr; |
|
356 |
gd->month = mo; |
|
357 |
} |
|
358 |
||
359 |
static void OperatingProfitWndProc(Window *w, WindowEvent *e) |
|
360 |
{ |
|
2952 | 361 |
switch (e->event) { |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
362 |
case WE_PAINT: { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
363 |
GraphDrawer gd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
364 |
const Player* p; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
365 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
366 |
DrawWindowWidgets(w); |
0 | 367 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
368 |
gd.left = 2; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
369 |
gd.top = 18; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
370 |
gd.height = 136; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
371 |
gd.has_negative_values = true; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
372 |
gd.format_str_y_axis = STR_CURRCOMPACT; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
373 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
374 |
SetupGraphDrawerForPlayers(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
375 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
376 |
int numd = 0; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
377 |
FOR_ALL_PLAYERS(p) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
378 |
if (p->is_active) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
379 |
gd.colors[numd] = _colour_gradient[p->player_color][6]; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
380 |
for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
381 |
gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : (p->old_economy[j].income + p->old_economy[j].expenses); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
382 |
i++; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
383 |
} |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
384 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
385 |
numd++; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
386 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
387 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
388 |
gd.num_dataset = numd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
389 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
390 |
DrawGraph(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
391 |
break; |
0 | 392 |
} |
1085
408f95e1b70a
(svn r1586) Fix: [ 1107340 ] Graphs don't show comapany info for company #8
dominik
parents:
1079
diff
changeset
|
393 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
394 |
case WE_CLICK: |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
395 |
/* Clicked on legend? */ |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
396 |
if (e->we.click.widget == 2) ShowGraphLegend(); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
397 |
break; |
0 | 398 |
} |
399 |
} |
|
400 |
||
401 |
static const Widget _operating_profit_widgets[] = { |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
402 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
534
diff
changeset
|
403 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 525, 0, 13, STR_7025_OPERATING_PROFIT_GRAPH, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
404 |
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 526, 575, 0, 13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS}, |
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
405 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 575, 14, 173, 0x0, STR_NULL}, |
176
84990c4b9212
(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
darkvater
parents:
165
diff
changeset
|
406 |
{ WIDGETS_END}, |
0 | 407 |
}; |
408 |
||
409 |
static const WindowDesc _operating_profit_desc = { |
|
5070
0bbf5264bfb7
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
4938
diff
changeset
|
410 |
WDP_AUTO, WDP_AUTO, 576, 174, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
6063
diff
changeset
|
411 |
WC_OPERATING_PROFIT, WC_NONE, |
0 | 412 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, |
413 |
_operating_profit_widgets, |
|
414 |
OperatingProfitWndProc |
|
415 |
}; |
|
416 |
||
417 |
||
6573 | 418 |
void ShowOperatingProfitGraph() |
0 | 419 |
{ |
420 |
if (AllocateWindowDescFront(&_operating_profit_desc, 0)) { |
|
421 |
InvalidateWindow(WC_GRAPH_LEGEND, 0); |
|
422 |
} |
|
423 |
} |
|
424 |
||
425 |
||
426 |
/****************/ |
|
427 |
/* INCOME GRAPH */ |
|
428 |
/****************/ |
|
429 |
||
430 |
static void IncomeGraphWndProc(Window *w, WindowEvent *e) |
|
431 |
{ |
|
2952 | 432 |
switch (e->event) { |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
433 |
case WE_PAINT: { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
434 |
GraphDrawer gd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
435 |
const Player* p; |
0 | 436 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
437 |
DrawWindowWidgets(w); |
0 | 438 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
439 |
gd.left = 2; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
440 |
gd.top = 18; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
441 |
gd.height = 104; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
442 |
gd.has_negative_values = false; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
443 |
gd.format_str_y_axis = STR_CURRCOMPACT; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
444 |
SetupGraphDrawerForPlayers(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
445 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
446 |
int numd = 0; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
447 |
FOR_ALL_PLAYERS(p) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
448 |
if (p->is_active) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
449 |
gd.colors[numd] = _colour_gradient[p->player_color][6]; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
450 |
for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
451 |
gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].income; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
452 |
i++; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
453 |
} |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
454 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
455 |
numd++; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
456 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
457 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
458 |
gd.num_dataset = numd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
459 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
460 |
DrawGraph(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
461 |
break; |
0 | 462 |
} |
463 |
||
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
464 |
case WE_CLICK: |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
465 |
if (e->we.click.widget == 2) ShowGraphLegend(); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
466 |
break; |
0 | 467 |
} |
468 |
} |
|
469 |
||
470 |
static const Widget _income_graph_widgets[] = { |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
471 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
534
diff
changeset
|
472 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 525, 0, 13, STR_7022_INCOME_GRAPH, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
473 |
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 526, 575, 0, 13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS}, |
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
474 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 575, 14, 141, 0x0, STR_NULL}, |
176
84990c4b9212
(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
darkvater
parents:
165
diff
changeset
|
475 |
{ WIDGETS_END}, |
0 | 476 |
}; |
477 |
||
478 |
static const WindowDesc _income_graph_desc = { |
|
5070
0bbf5264bfb7
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
4938
diff
changeset
|
479 |
WDP_AUTO, WDP_AUTO, 576, 142, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
6063
diff
changeset
|
480 |
WC_INCOME_GRAPH, WC_NONE, |
0 | 481 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, |
482 |
_income_graph_widgets, |
|
483 |
IncomeGraphWndProc |
|
484 |
}; |
|
485 |
||
6573 | 486 |
void ShowIncomeGraph() |
0 | 487 |
{ |
488 |
if (AllocateWindowDescFront(&_income_graph_desc, 0)) { |
|
489 |
InvalidateWindow(WC_GRAPH_LEGEND, 0); |
|
490 |
} |
|
491 |
} |
|
492 |
||
493 |
/*******************/ |
|
494 |
/* DELIVERED CARGO */ |
|
495 |
/*******************/ |
|
496 |
||
497 |
static void DeliveredCargoGraphWndProc(Window *w, WindowEvent *e) |
|
498 |
{ |
|
2952 | 499 |
switch (e->event) { |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
500 |
case WE_PAINT: { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
501 |
GraphDrawer gd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
502 |
const Player* p; |
0 | 503 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
504 |
DrawWindowWidgets(w); |
0 | 505 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
506 |
gd.left = 2; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
507 |
gd.top = 18; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
508 |
gd.height = 104; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
509 |
gd.has_negative_values = false; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
510 |
gd.format_str_y_axis = STR_7024; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
511 |
SetupGraphDrawerForPlayers(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
512 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
513 |
int numd = 0; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
514 |
FOR_ALL_PLAYERS(p) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
515 |
if (p->is_active) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
516 |
gd.colors[numd] = _colour_gradient[p->player_color][6]; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
517 |
for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
518 |
gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].delivered_cargo; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
519 |
i++; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
520 |
} |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
521 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
522 |
numd++; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
523 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
524 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
525 |
gd.num_dataset = numd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
526 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
527 |
DrawGraph(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
528 |
break; |
0 | 529 |
} |
530 |
||
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
531 |
case WE_CLICK: |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
532 |
if (e->we.click.widget == 2) ShowGraphLegend(); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
533 |
break; |
0 | 534 |
} |
535 |
} |
|
536 |
||
537 |
static const Widget _delivered_cargo_graph_widgets[] = { |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
538 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
534
diff
changeset
|
539 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 525, 0, 13, STR_7050_UNITS_OF_CARGO_DELIVERED, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
540 |
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 526, 575, 0, 13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS}, |
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
541 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 575, 14, 141, 0x0, STR_NULL}, |
176
84990c4b9212
(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
darkvater
parents:
165
diff
changeset
|
542 |
{ WIDGETS_END}, |
0 | 543 |
}; |
544 |
||
545 |
static const WindowDesc _delivered_cargo_graph_desc = { |
|
5070
0bbf5264bfb7
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
4938
diff
changeset
|
546 |
WDP_AUTO, WDP_AUTO, 576, 142, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
6063
diff
changeset
|
547 |
WC_DELIVERED_CARGO, WC_NONE, |
0 | 548 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, |
549 |
_delivered_cargo_graph_widgets, |
|
550 |
DeliveredCargoGraphWndProc |
|
551 |
}; |
|
552 |
||
6573 | 553 |
void ShowDeliveredCargoGraph() |
0 | 554 |
{ |
555 |
if (AllocateWindowDescFront(&_delivered_cargo_graph_desc, 0)) { |
|
556 |
InvalidateWindow(WC_GRAPH_LEGEND, 0); |
|
557 |
} |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
558 |
} |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
559 |
|
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
560 |
/***********************/ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
561 |
/* PERFORMANCE HISTORY */ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
562 |
/***********************/ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
563 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
564 |
static void PerformanceHistoryWndProc(Window *w, WindowEvent *e) |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
565 |
{ |
2952 | 566 |
switch (e->event) { |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
567 |
case WE_PAINT: { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
568 |
GraphDrawer gd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
569 |
const Player* p; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
570 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
571 |
DrawWindowWidgets(w); |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
572 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
573 |
gd.left = 2; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
574 |
gd.top = 18; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
575 |
gd.height = 200; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
576 |
gd.has_negative_values = false; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
577 |
gd.format_str_y_axis = STR_7024; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
578 |
SetupGraphDrawerForPlayers(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
579 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
580 |
int numd = 0; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
581 |
FOR_ALL_PLAYERS(p) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
582 |
if (p->is_active) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
583 |
gd.colors[numd] = _colour_gradient[p->player_color][6]; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
584 |
for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
585 |
gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].performance_history; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
586 |
i++; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
587 |
} |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
588 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
589 |
numd++; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
590 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
591 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
592 |
gd.num_dataset = numd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
593 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
594 |
DrawGraph(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
595 |
break; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
596 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
597 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
598 |
case WE_CLICK: |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
599 |
if (e->we.click.widget == 2) ShowGraphLegend(); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
600 |
if (e->we.click.widget == 3) ShowPerformanceRatingDetail(); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
601 |
break; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
602 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
603 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
604 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
605 |
static const Widget _performance_history_widgets[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
606 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
607 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 475, 0, 13, STR_7051_COMPANY_PERFORMANCE_RATINGS, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
608 |
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 526, 575, 0, 13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
609 |
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 476, 525, 0, 13, STR_PERFORMANCE_DETAIL_KEY, STR_704D_SHOW_KEY_TO_GRAPHS}, |
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
610 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 575, 14, 237, 0x0, STR_NULL}, |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
611 |
{ WIDGETS_END}, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
612 |
}; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
613 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
614 |
static const WindowDesc _performance_history_desc = { |
5070
0bbf5264bfb7
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
4938
diff
changeset
|
615 |
WDP_AUTO, WDP_AUTO, 576, 238, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
6063
diff
changeset
|
616 |
WC_PERFORMANCE_HISTORY, WC_NONE, |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
617 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
618 |
_performance_history_widgets, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
619 |
PerformanceHistoryWndProc |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
620 |
}; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
621 |
|
6573 | 622 |
void ShowPerformanceHistoryGraph() |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
623 |
{ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
624 |
if (AllocateWindowDescFront(&_performance_history_desc, 0)) { |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
625 |
InvalidateWindow(WC_GRAPH_LEGEND, 0); |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
626 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
627 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
628 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
629 |
/*****************/ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
630 |
/* COMPANY VALUE */ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
631 |
/*****************/ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
632 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
633 |
static void CompanyValueGraphWndProc(Window *w, WindowEvent *e) |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
634 |
{ |
2952 | 635 |
switch (e->event) { |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
636 |
case WE_PAINT: { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
637 |
GraphDrawer gd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
638 |
const Player* p; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
639 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
640 |
DrawWindowWidgets(w); |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
641 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
642 |
gd.left = 2; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
643 |
gd.top = 18; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
644 |
gd.height = 200; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
645 |
gd.has_negative_values = false; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
646 |
gd.format_str_y_axis = STR_CURRCOMPACT; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
647 |
SetupGraphDrawerForPlayers(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
648 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
649 |
int numd = 0; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
650 |
FOR_ALL_PLAYERS(p) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
651 |
if (p->is_active) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
652 |
gd.colors[numd] = _colour_gradient[p->player_color][6]; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
653 |
for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
654 |
gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].company_value; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
655 |
i++; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
656 |
} |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
657 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
658 |
numd++; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
659 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
660 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
661 |
gd.num_dataset = numd; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
662 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
663 |
DrawGraph(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
664 |
break; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
665 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
666 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
667 |
case WE_CLICK: |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
668 |
if (e->we.click.widget == 2) ShowGraphLegend(); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
669 |
break; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
670 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
671 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
672 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
673 |
static const Widget _company_value_graph_widgets[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
674 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
675 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 525, 0, 13, STR_7052_COMPANY_VALUES, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
676 |
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 526, 575, 0, 13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS}, |
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
677 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 575, 14, 237, 0x0, STR_NULL}, |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
678 |
{ WIDGETS_END}, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
679 |
}; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
680 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
681 |
static const WindowDesc _company_value_graph_desc = { |
5070
0bbf5264bfb7
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
4938
diff
changeset
|
682 |
WDP_AUTO, WDP_AUTO, 576, 238, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
6063
diff
changeset
|
683 |
WC_COMPANY_VALUE, WC_NONE, |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
684 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
685 |
_company_value_graph_widgets, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
686 |
CompanyValueGraphWndProc |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
687 |
}; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
688 |
|
6573 | 689 |
void ShowCompanyValueGraph() |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
690 |
{ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
691 |
if (AllocateWindowDescFront(&_company_value_graph_desc, 0)) { |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
692 |
InvalidateWindow(WC_GRAPH_LEGEND, 0); |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
693 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
694 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
695 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
696 |
/*****************/ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
697 |
/* PAYMENT RATES */ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
698 |
/*****************/ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
699 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
700 |
static void CargoPaymentRatesWndProc(Window *w, WindowEvent *e) |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
701 |
{ |
2952 | 702 |
switch (e->event) { |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
703 |
case WE_PAINT: { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
704 |
GraphDrawer gd; |
4851
15d60e1f41a2
(svn r6777) -GuiChange: When painting a lowered button on CargoPaymentsRates, displace the content of one pixel to the right and to the bottom. This will make it look like a normal button
belugas
parents:
4760
diff
changeset
|
705 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
706 |
DrawWindowWidgets(w); |
6518
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
707 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
708 |
int x = 495; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
709 |
int y = 24; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
710 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
711 |
gd.excluded_data = _legend_excluded_cargo; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
712 |
gd.left = 2; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
713 |
gd.top = 24; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
714 |
gd.height = w->height - 38; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
715 |
gd.has_negative_values = false; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
716 |
gd.format_str_y_axis = STR_CURRCOMPACT; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
717 |
gd.num_on_x_axis = 20; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
718 |
gd.num_vert_lines = 20; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
719 |
gd.month = 0xFF; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
720 |
gd.x_values_start = 10; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
721 |
gd.x_values_increment = 10; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
722 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
723 |
uint i = 0; |
9505 | 724 |
for (CargoID c = 0; c < NUM_CARGO; c++) { |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
725 |
const CargoSpec *cs = GetCargo(c); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
726 |
if (!cs->IsValid()) continue; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
727 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
728 |
/* Only draw labels for widgets that exist. If the widget doesn't |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
729 |
* exist then the local player has used the climate cheat or |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
730 |
* changed the NewGRF configuration with this window open. */ |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
731 |
if (i + 3 < w->widget_count) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
732 |
/* Since the buttons have no text, no images, |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
733 |
* both the text and the colored box have to be manually painted. |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
734 |
* clk_dif will move one pixel down and one pixel to the right |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
735 |
* when the button is clicked */ |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
736 |
byte clk_dif = IsWindowWidgetLowered(w, i + 3) ? 1 : 0; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
737 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
738 |
GfxFillRect(x + clk_dif, y + clk_dif, x + 8 + clk_dif, y + 5 + clk_dif, 0); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
739 |
GfxFillRect(x + 1 + clk_dif, y + 1 + clk_dif, x + 7 + clk_dif, y + 4 + clk_dif, cs->legend_colour); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
740 |
SetDParam(0, cs->name); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
741 |
DrawString(x + 14 + clk_dif, y + clk_dif, STR_7065, 0); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
742 |
y += 8; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
743 |
} |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
744 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
745 |
gd.colors[i] = cs->legend_colour; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
746 |
for (uint j = 0; j != 20; j++) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
747 |
gd.cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 6 + 6, c); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
748 |
} |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
749 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
750 |
i++; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
751 |
} |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
752 |
gd.num_dataset = i; |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
753 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
754 |
DrawGraph(&gd); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
755 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
756 |
DrawString(2 + 46, 24 + gd.height + 7, STR_7062_DAYS_IN_TRANSIT, 0); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
757 |
DrawString(2 + 84, 24 - 9, STR_7063_PAYMENT_FOR_DELIVERING, 0); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
758 |
break; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
759 |
} |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
760 |
|
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
761 |
case WE_CLICK: |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
762 |
if (e->we.click.widget >= 3) { |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
763 |
TOGGLEBIT(_legend_excluded_cargo, e->we.click.widget - 3); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
764 |
ToggleWidgetLoweredState(w, e->we.click.widget); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
765 |
SetWindowDirty(w); |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
766 |
} |
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
767 |
break; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
768 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
769 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
770 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
771 |
static const Widget _cargo_payment_rates_widgets[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
772 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
773 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 567, 0, 13, STR_7061_CARGO_PAYMENT_RATES, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
6518
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
774 |
{ WWT_PANEL, RESIZE_BOTTOM, 14, 0, 567, 14, 45, 0x0, STR_NULL}, |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
775 |
{ WIDGETS_END}, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
776 |
}; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
777 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
778 |
static const WindowDesc _cargo_payment_rates_desc = { |
6518
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
779 |
WDP_AUTO, WDP_AUTO, 568, 46, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
6063
diff
changeset
|
780 |
WC_PAYMENT_RATES, WC_NONE, |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
781 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
782 |
_cargo_payment_rates_widgets, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
783 |
CargoPaymentRatesWndProc |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
784 |
}; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
785 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
786 |
|
6573 | 787 |
void ShowCargoPaymentRates() |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
788 |
{ |
6518
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
789 |
Window *w = AllocateWindowDescFront(&_cargo_payment_rates_desc, 0); |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
790 |
if (w == NULL) return; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
791 |
|
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
792 |
/* Count the number of active cargo types */ |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
793 |
uint num_active = 0; |
9505 | 794 |
for (CargoID c = 0; c < NUM_CARGO; c++) { |
6518
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
795 |
if (GetCargo(c)->IsValid()) num_active++; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
796 |
} |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
797 |
|
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
798 |
/* Resize the window to fit the cargo types */ |
9545 | 799 |
ResizeWindow(w, 0, max(num_active, 12U) * 8); |
6518
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
800 |
|
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
801 |
/* Add widgets for each cargo type */ |
6596
0c6bff37a6e8
(svn r9079) -Codechange: add WWT_LAST widget when dynamically building cargo payment graph
peter1138
parents:
6574
diff
changeset
|
802 |
w->widget_count += num_active; |
0c6bff37a6e8
(svn r9079) -Codechange: add WWT_LAST widget when dynamically building cargo payment graph
peter1138
parents:
6574
diff
changeset
|
803 |
w->widget = ReallocT(w->widget, w->widget_count + 1); |
0c6bff37a6e8
(svn r9079) -Codechange: add WWT_LAST widget when dynamically building cargo payment graph
peter1138
parents:
6574
diff
changeset
|
804 |
w->widget[w->widget_count].type = WWT_LAST; |
6518
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
805 |
|
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
806 |
/* Set the properties of each widget */ |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
807 |
for (uint i = 0; i != num_active; i++) { |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
808 |
Widget *wi = &w->widget[3 + i]; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
809 |
wi->type = WWT_PANEL; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
810 |
wi->display_flags = RESIZE_NONE; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
811 |
wi->color = 12; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
812 |
wi->left = 493; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
813 |
wi->right = 562; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
814 |
wi->top = 24 + i * 8; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
815 |
wi->bottom = wi->top + 7; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
816 |
wi->data = 0; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
817 |
wi->tooltips = STR_7064_TOGGLE_GRAPH_FOR_CARGO; |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
818 |
|
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
819 |
if (!HASBIT(_legend_excluded_cargo, i)) LowerWindowWidget(w, i + 3); |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
820 |
} |
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
821 |
|
c7ac357020e3
(svn r8972) -Codechange: Dynamically add buttons on the cargo payment graph. This lets us remove the gaps and allow more than 12 cargo types later.
peter1138
parents:
6505
diff
changeset
|
822 |
SetWindowDirty(w); |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
823 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
824 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
825 |
/************************/ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
826 |
/* COMPANY LEAGUE TABLE */ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
827 |
/************************/ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
828 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
829 |
static const StringID _performance_titles[] = { |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
830 |
STR_7066_ENGINEER, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
831 |
STR_7066_ENGINEER, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
832 |
STR_7067_TRAFFIC_MANAGER, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
833 |
STR_7067_TRAFFIC_MANAGER, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
834 |
STR_7068_TRANSPORT_COORDINATOR, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
835 |
STR_7068_TRANSPORT_COORDINATOR, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
836 |
STR_7069_ROUTE_SUPERVISOR, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
837 |
STR_7069_ROUTE_SUPERVISOR, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
838 |
STR_706A_DIRECTOR, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
839 |
STR_706A_DIRECTOR, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
840 |
STR_706B_CHIEF_EXECUTIVE, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
841 |
STR_706B_CHIEF_EXECUTIVE, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
842 |
STR_706C_CHAIRMAN, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
843 |
STR_706C_CHAIRMAN, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
844 |
STR_706D_PRESIDENT, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
845 |
STR_706E_TYCOON, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
846 |
}; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
847 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
848 |
static inline StringID GetPerformanceTitleFromValue(uint value) |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
849 |
{ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
850 |
return _performance_titles[minu(value, 1000) >> 6]; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
851 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
852 |
|
2656
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
853 |
static int CDECL PerfHistComp(const void* elem1, const void* elem2) |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
854 |
{ |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
855 |
const Player* p1 = *(const Player* const*)elem1; |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
856 |
const Player* p2 = *(const Player* const*)elem2; |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
857 |
|
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
858 |
return p2->old_economy[1].performance_history - p1->old_economy[1].performance_history; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
859 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
860 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
861 |
static void CompanyLeagueWndProc(Window *w, WindowEvent *e) |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
862 |
{ |
2482
dffcca243dbc
(svn r3008) [ 1247535 ] Native Support for Win64 (compile&run only) (michi_cc)
Darkvater
parents:
2475
diff
changeset
|
863 |
switch (e->event) { |
2656
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
864 |
case WE_PAINT: { |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
865 |
const Player* plist[MAX_PLAYERS]; |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
866 |
const Player* p; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
867 |
|
2656
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
868 |
DrawWindowWidgets(w); |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
869 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
870 |
uint pl_num = 0; |
2656
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
871 |
FOR_ALL_PLAYERS(p) if (p->is_active) plist[pl_num++] = p; |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
872 |
|
2673
1c1e8cb73c67
(svn r3215) - Fix: warning on VS.NET 2003 complaining about constness reintroduced by revision 3192
Darkvater
parents:
2656
diff
changeset
|
873 |
qsort((void*)plist, pl_num, sizeof(*plist), PerfHistComp); |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
874 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
875 |
for (uint i = 0; i != pl_num; i++) { |
2656
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
876 |
p = plist[i]; |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
877 |
SetDParam(0, i + STR_01AC_1ST); |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
878 |
SetDParam(1, p->name_1); |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
879 |
SetDParam(2, p->name_2); |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
880 |
SetDParam(3, GetPlayerNameString(p->index, 4)); |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
881 |
SetDParam(5, GetPerformanceTitleFromValue(p->old_economy[1].performance_history)); |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
882 |
|
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
883 |
DrawString(2, 15 + i * 10, i == 0 ? STR_7054 : STR_7055, 0); |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
884 |
DrawPlayerIcon(p->index, 27, 16 + i * 10); |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
885 |
} |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
886 |
|
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
887 |
break; |
796b75ba15e3
(svn r3198) Rewrite the company league drawing routine for better readability
tron
parents:
2639
diff
changeset
|
888 |
} |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
889 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
890 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
891 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
892 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
893 |
static const Widget _company_league_widgets[] = { |
2869
5cf9acd29edd
(svn r3417) - Make company league table window pinnable.
peter1138
parents:
2725
diff
changeset
|
894 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
5cf9acd29edd
(svn r3417) - Make company league table window pinnable.
peter1138
parents:
2725
diff
changeset
|
895 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 387, 0, 13, STR_7053_COMPANY_LEAGUE_TABLE, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
5cf9acd29edd
(svn r3417) - Make company league table window pinnable.
peter1138
parents:
2725
diff
changeset
|
896 |
{ WWT_STICKYBOX, RESIZE_NONE, 14, 388, 399, 0, 13, STR_NULL, STR_STICKY_BUTTON}, |
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
897 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 399, 14, 96, 0x0, STR_NULL}, |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
898 |
{ WIDGETS_END}, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
899 |
}; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
900 |
|
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
901 |
static const WindowDesc _company_league_desc = { |
5070
0bbf5264bfb7
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
4938
diff
changeset
|
902 |
WDP_AUTO, WDP_AUTO, 400, 97, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
6063
diff
changeset
|
903 |
WC_COMPANY_LEAGUE, WC_NONE, |
2869
5cf9acd29edd
(svn r3417) - Make company league table window pinnable.
peter1138
parents:
2725
diff
changeset
|
904 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON, |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
905 |
_company_league_widgets, |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
906 |
CompanyLeagueWndProc |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
907 |
}; |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
908 |
|
6573 | 909 |
void ShowCompanyLeagueTable() |
1086
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
910 |
{ |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
911 |
AllocateWindowDescFront(&_company_league_desc,0); |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
912 |
} |
9d00ef71146e
(svn r1587) -CodeChange: fixed up the graph loop a little..numd now shows the exact amount, no +1 needed
darkvater
parents:
1085
diff
changeset
|
913 |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
914 |
/*****************************/ |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
915 |
/* PERFORMANCE RATING DETAIL */ |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
916 |
/*****************************/ |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
917 |
|
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
918 |
static void PerformanceRatingDetailWndProc(Window *w, WindowEvent *e) |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
919 |
{ |
6197
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
920 |
static PlayerID _performance_rating_detail_player = INVALID_PLAYER; |
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
921 |
|
2952 | 922 |
switch (e->event) { |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
923 |
case WE_PAINT: { |
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
924 |
byte x; |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
925 |
uint16 y = 14; |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
926 |
int total_score = 0; |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
927 |
int color_done, color_notdone; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
928 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
929 |
/* Draw standard stuff */ |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
930 |
DrawWindowWidgets(w); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
931 |
|
6197
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
932 |
/* Check if the currently selected player is still active. */ |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
933 |
if (_performance_rating_detail_player == INVALID_PLAYER || !GetPlayer(_performance_rating_detail_player)->is_active) { |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
934 |
if (_performance_rating_detail_player != INVALID_PLAYER) { |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
935 |
/* Raise and disable the widget for the previous selection. */ |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
936 |
RaiseWindowWidget(w, _performance_rating_detail_player + 13); |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
937 |
DisableWindowWidget(w, _performance_rating_detail_player + 13); |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
938 |
SetWindowDirty(w); |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
939 |
|
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
940 |
_performance_rating_detail_player = INVALID_PLAYER; |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
941 |
} |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
942 |
|
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
943 |
for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) { |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
944 |
if (GetPlayer(i)->is_active) { |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
945 |
/* Lower the widget corresponding to this player. */ |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
946 |
LowerWindowWidget(w, i + 13); |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
947 |
SetWindowDirty(w); |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
948 |
|
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
949 |
_performance_rating_detail_player = i; |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
950 |
break; |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
951 |
} |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
952 |
} |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
953 |
} |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
954 |
|
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
955 |
/* If there are no active players, don't display anything else. */ |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
956 |
if (_performance_rating_detail_player == INVALID_PLAYER) break; |
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
957 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
958 |
/* Paint the player icons */ |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
959 |
for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) { |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
960 |
if (!GetPlayer(i)->is_active) { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
961 |
/* Check if we have the player as an active player */ |
4709
eff35edfb653
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4702
diff
changeset
|
962 |
if (!IsWindowWidgetDisabled(w, i + 13)) { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
963 |
/* Bah, player gone :( */ |
4709
eff35edfb653
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4702
diff
changeset
|
964 |
DisableWindowWidget(w, i + 13); |
6197
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
965 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
966 |
/* We need a repaint */ |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
967 |
SetWindowDirty(w); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
968 |
} |
6197
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
969 |
continue; |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
970 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
971 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
972 |
/* Check if we have the player marked as inactive */ |
4709
eff35edfb653
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4702
diff
changeset
|
973 |
if (IsWindowWidgetDisabled(w, i + 13)) { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
974 |
/* New player! Yippie :p */ |
4709
eff35edfb653
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4702
diff
changeset
|
975 |
EnableWindowWidget(w, i + 13); |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
976 |
/* We need a repaint */ |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
977 |
SetWindowDirty(w); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
978 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
979 |
|
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
980 |
x = (i == _performance_rating_detail_player) ? 1 : 0; |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
981 |
DrawPlayerIcon(i, i * 37 + 13 + x, 16 + x); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
982 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
983 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
984 |
/* The colors used to show how the progress is going */ |
4444
9c9c7f962482
(svn r6222) Remove struct ColorList, because the names of its attributes are plain confusing
tron
parents:
4365
diff
changeset
|
985 |
color_done = _colour_gradient[COLOUR_GREEN][4]; |
9c9c7f962482
(svn r6222) Remove struct ColorList, because the names of its attributes are plain confusing
tron
parents:
4365
diff
changeset
|
986 |
color_notdone = _colour_gradient[COLOUR_RED][4]; |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
987 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
988 |
/* Draw all the score parts */ |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
989 |
for (ScoreID i = SCORE_BEGIN; i < SCORE_END; i++) { |
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
990 |
int val = _score_part[_performance_rating_detail_player][i]; |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
991 |
int needed = _score_info[i].needed; |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
992 |
int score = _score_info[i].score; |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
993 |
|
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
994 |
y += 20; |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
995 |
/* SCORE_TOTAL has his own rulez ;) */ |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
996 |
if (i == SCORE_TOTAL) { |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
997 |
needed = total_score; |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
998 |
score = SCORE_MAX; |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
999 |
} else { |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1000 |
total_score += score; |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1001 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1002 |
|
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1003 |
DrawString(7, y, STR_PERFORMANCE_DETAIL_VEHICLES + i, 0); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1004 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1005 |
/* Draw the score */ |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1006 |
SetDParam(0, score); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1007 |
DrawStringRightAligned(107, y, SET_PERFORMANCE_DETAIL_INT, 0); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1008 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1009 |
/* Calculate the %-bar */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1010 |
if (val > needed) { |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1011 |
x = 50; |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1012 |
} else if (val == 0) { |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1013 |
x = 0; |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1014 |
} else { |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1015 |
x = val * 50 / needed; |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1016 |
} |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1017 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1018 |
/* SCORE_LOAN is inversed */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1019 |
if (val < 0 && i == SCORE_LOAN) x = 0; |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1020 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1021 |
/* Draw the bar */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1022 |
if (x != 0) GfxFillRect(112, y - 2, 112 + x, y + 10, color_done); |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1023 |
if (x != 50) GfxFillRect(112 + x, y - 2, 112 + 50, y + 10, color_notdone); |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1024 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1025 |
/* Calculate the % */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1026 |
x = (val <= needed) ? val * 100 / needed : 100; |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1027 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1028 |
/* SCORE_LOAN is inversed */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1029 |
if (val < 0 && i == SCORE_LOAN) x = 0; |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1030 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1031 |
/* Draw it */ |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1032 |
SetDParam(0, x); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1033 |
DrawStringCentered(137, y, STR_PERFORMANCE_DETAIL_PERCENT, 0); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1034 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1035 |
/* SCORE_LOAN is inversed */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1036 |
if (i == SCORE_LOAN) val = needed - val; |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1037 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1038 |
/* Draw the amount we have against what is needed |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1039 |
* For some of them it is in currency format */ |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1040 |
SetDParam(0, val); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1041 |
SetDParam(1, needed); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1042 |
switch (i) { |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1043 |
case SCORE_MIN_PROFIT: |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1044 |
case SCORE_MIN_INCOME: |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1045 |
case SCORE_MAX_INCOME: |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1046 |
case SCORE_MONEY: |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1047 |
case SCORE_LOAN: |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1048 |
DrawString(167, y, STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY, 0); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1049 |
break; |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1050 |
default: |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1051 |
DrawString(167, y, STR_PERFORMANCE_DETAIL_AMOUNT_INT, 0); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1052 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1053 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1054 |
|
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1055 |
break; |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1056 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
1057 |
|
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1058 |
case WE_CLICK: |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1059 |
/* Check which button is clicked */ |
4634
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4444
diff
changeset
|
1060 |
if (IS_INT_INSIDE(e->we.click.widget, 13, 21)) { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1061 |
/* Is it no on disable? */ |
4709
eff35edfb653
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4702
diff
changeset
|
1062 |
if (!IsWindowWidgetDisabled(w, e->we.click.widget)) { |
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
1063 |
RaiseWindowWidget(w, _performance_rating_detail_player + 13); |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
1064 |
_performance_rating_detail_player = (PlayerID)(e->we.click.widget - 13); |
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
1065 |
LowerWindowWidget(w, _performance_rating_detail_player + 13); |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1066 |
SetWindowDirty(w); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1067 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1068 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1069 |
break; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
1070 |
|
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1071 |
case WE_CREATE: { |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1072 |
Player *p2; |
4702
5179f9adc5b3
(svn r6612) -Codechange: Use accessors for hidden_state.
belugas
parents:
4634
diff
changeset
|
1073 |
|
4709
eff35edfb653
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4702
diff
changeset
|
1074 |
/* Disable the players who are not active */ |
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
1075 |
for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) { |
4709
eff35edfb653
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4702
diff
changeset
|
1076 |
SetWindowWidgetDisabledState(w, i + 13, !GetPlayer(i)->is_active); |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1077 |
} |
4719
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
1078 |
/* Update all player stats with the current data |
413b21513ef7
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
1079 |
* (this is because _score_info is not saved to a savegame) */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1080 |
FOR_ALL_PLAYERS(p2) { |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1081 |
if (p2->is_active) UpdateCompanyRatingAndValue(p2, false); |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1082 |
} |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1083 |
|
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1084 |
w->custom[0] = DAY_TICKS; |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1085 |
w->custom[1] = 5; |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1086 |
|
6197
4ee36c52e467
(svn r8612) -Fix (r117) [FS#582]: When the currently selected player in the performance
maedhros
parents:
6144
diff
changeset
|
1087 |
if (_performance_rating_detail_player != INVALID_PLAYER) LowerWindowWidget(w, _performance_rating_detail_player + 13); |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1088 |
SetWindowDirty(w); |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1089 |
|
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1090 |
break; |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1091 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1092 |
|
6529
c53737959606
(svn r8989) -Fix: more indenting and variable scoping
peter1138
parents:
6518
diff
changeset
|
1093 |
case WE_TICK: |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1094 |
/* Update the player score every 5 days */ |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1095 |
if (--w->custom[0] == 0) { |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1096 |
w->custom[0] = DAY_TICKS; |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1097 |
if (--w->custom[1] == 0) { |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1098 |
Player *p2; |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1099 |
|
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1100 |
w->custom[1] = 5; |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1101 |
FOR_ALL_PLAYERS(p2) { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6417
diff
changeset
|
1102 |
/* Skip if player is not active */ |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1103 |
if (p2->is_active) UpdateCompanyRatingAndValue(p2, false); |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3027
diff
changeset
|
1104 |
} |
3027
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1105 |
SetWindowDirty(w); |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1106 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1107 |
} |
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1108 |
|
43ffdf4d6a1f
(svn r3607) - Fix indenting of PerformanceRatingDetailWndProc()
peter1138
parents:
2952
diff
changeset
|
1109 |
break; |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1110 |
} |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1111 |
} |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1112 |
|
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1113 |
static const Widget _performance_rating_detail_widgets[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
1114 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4293
diff
changeset
|
1115 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 298, 0, 13, STR_PERFORMANCE_DETAIL, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1116 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 14, 27, 0x0, STR_NULL}, |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1117 |
|
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1118 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 28, 47, 0x0, STR_PERFORMANCE_DETAIL_VEHICLES_TIP}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1119 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 48, 67, 0x0, STR_PERFORMANCE_DETAIL_STATIONS_TIP}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1120 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 68, 87, 0x0, STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1121 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 88, 107, 0x0, STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1122 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 108, 127, 0x0, STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1123 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 128, 147, 0x0, STR_PERFORMANCE_DETAIL_DELIVERED_TIP}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1124 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 148, 167, 0x0, STR_PERFORMANCE_DETAIL_CARGO_TIP}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1125 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 168, 187, 0x0, STR_PERFORMANCE_DETAIL_MONEY_TIP}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1126 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 188, 207, 0x0, STR_PERFORMANCE_DETAIL_LOAN_TIP}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1127 |
{ WWT_PANEL, RESIZE_NONE, 14, 0, 298, 208, 227, 0x0, STR_PERFORMANCE_DETAIL_TOTAL_TIP}, |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1128 |
|
4938
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1129 |
{ WWT_PANEL, RESIZE_NONE, 14, 2, 38, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1130 |
{ WWT_PANEL, RESIZE_NONE, 14, 39, 75, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1131 |
{ WWT_PANEL, RESIZE_NONE, 14, 76, 112, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1132 |
{ WWT_PANEL, RESIZE_NONE, 14, 113, 149, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1133 |
{ WWT_PANEL, RESIZE_NONE, 14, 150, 186, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1134 |
{ WWT_PANEL, RESIZE_NONE, 14, 187, 223, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1135 |
{ WWT_PANEL, RESIZE_NONE, 14, 224, 260, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
074f734a91ca
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4912
diff
changeset
|
1136 |
{ WWT_PANEL, RESIZE_NONE, 14, 261, 297, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, |
176
84990c4b9212
(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
darkvater
parents:
165
diff
changeset
|
1137 |
{ WIDGETS_END}, |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1138 |
}; |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1139 |
|
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1140 |
static const WindowDesc _performance_rating_detail_desc = { |
5070
0bbf5264bfb7
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
4938
diff
changeset
|
1141 |
WDP_AUTO, WDP_AUTO, 299, 228, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
6063
diff
changeset
|
1142 |
WC_PERFORMANCE_DETAIL, WC_NONE, |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1143 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1144 |
_performance_rating_detail_widgets, |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1145 |
PerformanceRatingDetailWndProc |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1146 |
}; |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1147 |
|
6573 | 1148 |
void ShowPerformanceRatingDetail() |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1149 |
{ |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1150 |
AllocateWindowDescFront(&_performance_rating_detail_desc, 0); |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
57
diff
changeset
|
1151 |
} |