1
0
Fork 0

(svn r23906) -Codechange: replace magic numbers with named constants (adf88)

release/1.2
rubidium 2012-02-06 20:47:47 +00:00
parent e42425a18d
commit 446758872c
1 changed files with 8 additions and 7 deletions

View File

@ -30,6 +30,7 @@
#include "../company_func.h" #include "../company_func.h"
#include "../core/geometry_func.hpp" #include "../core/geometry_func.hpp"
#include "../genworld.h" #include "../genworld.h"
#include "../map_type.h"
#include "../widgets/network_widget.h" #include "../widgets/network_widget.h"
@ -500,17 +501,17 @@ public:
case WID_NG_CLIENTS: case WID_NG_CLIENTS:
size->width += 2 * WD_SORTBUTTON_ARROW_WIDTH; // Make space for the arrow size->width += 2 * WD_SORTBUTTON_ARROW_WIDTH; // Make space for the arrow
SetDParam(0, 255); SetDParam(0, MAX_CLIENTS);
SetDParam(1, 255); SetDParam(1, MAX_CLIENTS);
SetDParam(2, 15); SetDParam(2, MAX_COMPANIES);
SetDParam(3, 15); SetDParam(3, MAX_COMPANIES);
*size = maxdim(*size, GetStringBoundingBox(STR_NETWORK_SERVER_LIST_GENERAL_ONLINE)); *size = maxdim(*size, GetStringBoundingBox(STR_NETWORK_SERVER_LIST_GENERAL_ONLINE));
break; break;
case WID_NG_MAPSIZE: case WID_NG_MAPSIZE:
size->width += 2 * WD_SORTBUTTON_ARROW_WIDTH; // Make space for the arrow size->width += 2 * WD_SORTBUTTON_ARROW_WIDTH; // Make space for the arrow
SetDParam(0, 2048); SetDParam(0, MAX_MAP_SIZE);
SetDParam(1, 2048); SetDParam(1, MAX_MAP_SIZE);
*size = maxdim(*size, GetStringBoundingBox(STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT)); *size = maxdim(*size, GetStringBoundingBox(STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT));
break; break;
@ -2057,7 +2058,7 @@ struct NetworkJoinStatusWindow : Window {
} }
/* For the number of waiting (other) players */ /* For the number of waiting (other) players */
SetDParam(0, 255); SetDParam(0, MAX_CLIENTS);
width = max(width, GetStringBoundingBox(STR_NETWORK_CONNECTING_WAITING).width); width = max(width, GetStringBoundingBox(STR_NETWORK_CONNECTING_WAITING).width);
/* Account for downloading ~ 10 MiB */ /* Account for downloading ~ 10 MiB */