Mercurial > hg > openttd

changeset 10477:20da0dd3f897 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r14732) -Codechange: replace some magic number with less magic constants and use the proper type for a few variables.
author rubidium <rubidium@openttd.org>
date Tue, 23 Dec 2008 21:03:43 +0000
parents 407e5dfa32ad
children 8d4e217e7f6d
files src/engine.cpp src/graph_gui.cpp src/settings.cpp src/town.h
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -315,7 +315,7 @@
 	const Company *c;
 	int32 best_hist;
 	CompanyID best_company;
-	uint mask = 0;
+	CompanyMask mask = 0;
 
 	do {
 		best_hist = -1;
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -66,7 +66,7 @@
 
 	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);
 		this->ToggleWidgetLoweredState(widget);
@@ -859,7 +859,7 @@
 private:
 	enum PerformanteRatingWidgets {
 		PRW_COMPANY_FIRST = 13,
-		PRW_COMPANY_LAST  = 20,
+		PRW_COMPANY_LAST  = PRW_COMPANY_FIRST + MAX_COMPANIES - 1,
 	};
 
 public:
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1234,7 +1234,7 @@
 	/***************************************************************************/
 	/* Saved patch variables. */
 	/* 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.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),
--- a/src/town.h
+++ b/src/town.h
@@ -122,7 +122,7 @@
 	uint16 noise_reached;
 
 	/* Which companies have a statue? */
-	byte statues;
+	CompanyMask statues;
 
 	/* Company ratings as well as a mask that determines which companies have a rating. */
 	CompanyMask have_ratings;