Mercurial > hg > openttd

changeset 9709:1fabb0e9edf1 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r13821) -Codechange: replace some uint8/bytes with more specificly named typedefs and replace a few magic numbers.
author rubidium <rubidium@openttd.org>
date Fri, 25 Jul 2008 10:00:03 +0000
parents c7dcf988274a
children 0a6c2353e2a6
files src/engine.cpp src/engine_base.h src/player_type.h src/town.h
diffstat 4 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -342,11 +342,11 @@
 					DeleteWindowById(WC_ENGINE_PREVIEW, i);
 					e->preview_player_rank++;
 				}
-			} else if (e->preview_player_rank != 0xFF) {
+			} else if (e->preview_player_rank != PLAYER_SPECTATOR) {
 				PlayerID best_player = GetBestPlayer(e->preview_player_rank);
 
 				if (best_player == PLAYER_SPECTATOR) {
-					e->preview_player_rank = 0xFF;
+					e->preview_player_rank = PLAYER_SPECTATOR;
 					continue;
 				}
 
@@ -419,7 +419,7 @@
 	AddRemoveEngineFromAutoreplaceAndBuildWindows(e->type);
 
 	/* Now available for all players */
-	e->player_avail = (byte)-1;
+	e->player_avail = (PlayerMask)-1;
 
 	/* Do not introduce new rail wagons */
 	if (IsWagon(index)) return;
--- a/src/engine_base.h
+++ b/src/engine_base.h
@@ -20,9 +20,9 @@
 	uint16 duration_phase_1, duration_phase_2, duration_phase_3;
 	byte lifelength;
 	byte flags;
-	uint8 preview_player_rank;
+	PlayerByte preview_player_rank;
 	byte preview_wait;
-	byte player_avail;
+	PlayerMask player_avail;
 	uint8 image_index; ///< Original vehicle image index
 	VehicleType type; ///< type, ie VEH_ROAD, VEH_TRAIN, etc.
 
--- a/src/player_type.h
+++ b/src/player_type.h
@@ -42,6 +42,8 @@
 typedef Owner PlayerID;
 typedef OwnerByte PlayerByte;
 
+typedef uint8 PlayerMask;
+
 struct Player;
 typedef uint32 PlayerFace; ///< player face bits, info see in player_face.h
 
--- a/src/town.h
+++ b/src/town.h
@@ -124,7 +124,7 @@
 	byte statues;
 
 	/* Player ratings as well as a mask that determines which players have a rating. */
-	byte have_ratings;
+	PlayerMask have_ratings;
 	uint8 unwanted[MAX_PLAYERS]; ///< how many months companies aren't wanted by towns (bribe)
 	PlayerByte exclusivity;      ///< which player has exslusivity
 	uint8 exclusive_counter;     ///< months till the exclusivity expires