mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13882) -Codechange: Replace widget numbers with appropriate enums

release/0.7
belugas 2008-07-30 17:13:55 +00:00
parent c840a63dfd
commit 63f7214abd
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/graph_gui.cpp
View File

@ -856,6 +856,13 @@ void ShowCompanyLeagueTable()
/*****************************/ /*****************************/
struct PerformanceRatingDetailWindow : Window { struct PerformanceRatingDetailWindow : Window {
private:
enum PerformanteRatingWidgets {
PRW_PLAYER_FIRST = 13,
PRW_PLAYER_LAST = 20,
};
public:
static PlayerID player; static PlayerID player;
int timeout; int timeout;
@ -863,12 +870,12 @@ struct PerformanceRatingDetailWindow : Window {
{ {
/* Disable the players who are not active */ /* Disable the players who are not active */
for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) { for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
this->SetWidgetDisabledState(i + 13, !IsValidPlayerID(i)); this->SetWidgetDisabledState(i + PRW_PLAYER_FIRST, !IsValidPlayerID(i));
} }
this->UpdatePlayerStats(); this->UpdatePlayerStats();
if (player != INVALID_PLAYER) this->LowerWidget(player + 13); if (player != INVALID_PLAYER) this->LowerWidget(player + PRW_PLAYER_FIRST);
this->FindWindowPlacementAndResize(desc); this->FindWindowPlacementAndResize(desc);
} }
@ -900,8 +907,8 @@ struct PerformanceRatingDetailWindow : Window {
if (player == INVALID_PLAYER || !IsValidPlayerID(player)) { if (player == INVALID_PLAYER || !IsValidPlayerID(player)) {
if (player != INVALID_PLAYER) { if (player != INVALID_PLAYER) {
/* Raise and disable the widget for the previous selection. */ /* Raise and disable the widget for the previous selection. */
this->RaiseWidget(player + 13); this->RaiseWidget(player + PRW_PLAYER_FIRST);
this->DisableWidget(player + 13); this->DisableWidget(player + PRW_PLAYER_FIRST);
this->SetDirty(); this->SetDirty();
player = INVALID_PLAYER; player = INVALID_PLAYER;
@ -910,7 +917,7 @@ struct PerformanceRatingDetailWindow : Window {
for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) { for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
if (IsValidPlayerID(i)) { if (IsValidPlayerID(i)) {
/* Lower the widget corresponding to this player. */ /* Lower the widget corresponding to this player. */
this->LowerWidget(i + 13); this->LowerWidget(i + PRW_PLAYER_FIRST);
this->SetDirty(); this->SetDirty();
player = i; player = i;
@ -926,9 +933,9 @@ struct PerformanceRatingDetailWindow : Window {
for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) { for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
if (!IsValidPlayerID(i)) { if (!IsValidPlayerID(i)) {
/* Check if we have the player as an active player */ /* Check if we have the player as an active player */
if (!this->IsWidgetDisabled(i + 13)) { if (!this->IsWidgetDisabled(i + PRW_PLAYER_FIRST)) {
/* Bah, player gone :( */ /* Bah, player gone :( */
this->DisableWidget(i + 13); this->DisableWidget(i + PRW_PLAYER_FIRST);
/* We need a repaint */ /* We need a repaint */
this->SetDirty(); this->SetDirty();
@ -937,9 +944,9 @@ struct PerformanceRatingDetailWindow : Window {
} }
/* Check if we have the player marked as inactive */ /* Check if we have the player marked as inactive */
if (this->IsWidgetDisabled(i + 13)) { if (this->IsWidgetDisabled(i + PRW_PLAYER_FIRST)) {
/* New player! Yippie :p */ /* New player! Yippie :p */
this->EnableWidget(i + 13); this->EnableWidget(i + PRW_PLAYER_FIRST);
/* We need a repaint */ /* We need a repaint */
this->SetDirty(); this->SetDirty();
} }
@ -1017,12 +1024,12 @@ struct PerformanceRatingDetailWindow : Window {
virtual void OnClick(Point pt, int widget) virtual void OnClick(Point pt, int widget)
{ {
/* Check which button is clicked */ /* Check which button is clicked */
if (IsInsideMM(widget, 13, 21)) { if (IsInsideMM(widget, PRW_PLAYER_FIRST, PRW_PLAYER_LAST + 1)) {
/* Is it no on disable? */ /* Is it no on disable? */
if (!this->IsWidgetDisabled(widget)) { if (!this->IsWidgetDisabled(widget)) {
this->RaiseWidget(player + 13); this->RaiseWidget(player + PRW_PLAYER_FIRST);
player = (PlayerID)(widget - 13); player = (PlayerID)(widget - PRW_PLAYER_FIRST);
this->LowerWidget(player + 13); this->LowerWidget(player + PRW_PLAYER_FIRST);
this->SetDirty(); this->SetDirty();
} }
} }