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

(svn r14732) -Codechange: replace some magic number with less magic constants and use the proper type for a few variables.

release/0.7
rubidium 2008-12-23 21:03:43 +00:00
parent ece37ca2c0
commit c3746a55bb
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine.cpp
View File

@ -315,7 +315,7 @@ static CompanyID GetBestCompany(uint8 pp)
const Company *c; const Company *c;
int32 best_hist; int32 best_hist;
CompanyID best_company; CompanyID best_company;
uint mask = 0; CompanyMask mask = 0;
do { do {
best_hist = -1; best_hist = -1;

4
src/graph_gui.cpp
View File

@ -66,7 +66,7 @@ struct GraphLegendWindow : Window {
virtual void OnClick(Point pt, int widget) virtual void OnClick(Point pt, int widget)
{ {
if (!IsInsideMM(widget, 3, 11)) return; if (!IsInsideMM(widget, 3, MAX_COMPANIES + 3)) return;
ToggleBit(_legend_excluded_companies, widget - 3); ToggleBit(_legend_excluded_companies, widget - 3);
this->ToggleWidgetLoweredState(widget); this->ToggleWidgetLoweredState(widget);
@ -859,7 +859,7 @@ struct PerformanceRatingDetailWindow : Window {
private: private:
enum PerformanteRatingWidgets { enum PerformanteRatingWidgets {
PRW_COMPANY_FIRST = 13, PRW_COMPANY_FIRST = 13,
PRW_COMPANY_LAST = 20, PRW_COMPANY_LAST = PRW_COMPANY_FIRST + MAX_COMPANIES - 1,
}; };
public: public:

2
src/settings.cpp
View File

@ -1234,7 +1234,7 @@ const SettingDesc _patch_settings[] = {
/***************************************************************************/ /***************************************************************************/
/* Saved patch variables. */ /* Saved patch variables. */
/* Do not ADD or REMOVE something in this "difficulty.XXX" table or before it. It breaks savegame compatability. */ /* Do not ADD or REMOVE something in this "difficulty.XXX" table or before it. It breaks savegame compatability. */
SDT_CONDVAR(GameSettings, difficulty.max_no_competitors, SLE_UINT8, 97, SL_MAX_VERSION, 0, 0, 2, 0, 7, 1, STR_NULL, DifficultyChange), SDT_CONDVAR(GameSettings, difficulty.max_no_competitors, SLE_UINT8, 97, SL_MAX_VERSION, 0, 0, 2,0,MAX_COMPANIES-1,1,STR_NULL, DifficultyChange),
SDT_CONDVAR(GameSettings, difficulty.competitor_start_time, SLE_UINT8, 97, SL_MAX_VERSION, 0,NG, 2, 0, 3, 1, STR_6830_IMMEDIATE, DifficultyChange), SDT_CONDVAR(GameSettings, difficulty.competitor_start_time, SLE_UINT8, 97, SL_MAX_VERSION, 0,NG, 2, 0, 3, 1, STR_6830_IMMEDIATE, DifficultyChange),
SDT_CONDVAR(GameSettings, difficulty.number_towns, SLE_UINT8, 97, SL_MAX_VERSION, 0,NG, 2, 0, 3, 1, STR_NUM_VERY_LOW, DifficultyChange), SDT_CONDVAR(GameSettings, difficulty.number_towns, SLE_UINT8, 97, SL_MAX_VERSION, 0,NG, 2, 0, 3, 1, STR_NUM_VERY_LOW, DifficultyChange),
SDT_CONDVAR(GameSettings, difficulty.number_industries, SLE_UINT8, 97, SL_MAX_VERSION, 0,NG, 4, 0, 4, 1, STR_NONE, DifficultyChange), SDT_CONDVAR(GameSettings, difficulty.number_industries, SLE_UINT8, 97, SL_MAX_VERSION, 0,NG, 4, 0, 4, 1, STR_NONE, DifficultyChange),

2
src/town.h
View File

@ -122,7 +122,7 @@ struct Town : PoolItem<Town, TownID, &_Town_pool> {
uint16 noise_reached; uint16 noise_reached;
/* Which companies have a statue? */ /* Which companies have a statue? */
byte statues; CompanyMask statues;
/* Company ratings as well as a mask that determines which companies have a rating. */ /* Company ratings as well as a mask that determines which companies have a rating. */
CompanyMask have_ratings; CompanyMask have_ratings;