cpp/openttd-patchpack/source Changeset - r6591:56d27ba364f1

Changeset - r6591:56d27ba364f1

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

peter1138 - 17 years ago 2007-05-07 11:24:23
peter1138@openttd.org

(svn r9805) -Codechange: Use HASBIT() et al for display options bits.

6 files changed with 29 insertions and 29 deletions:

src/main_gui.cpp

src/openttd.cpp

src/openttd.h

src/rail_cmd.cpp

src/road_cmd.cpp

src/viewport.cpp

0 comments (0 inline, 0 general)

src/main_gui.cpp

➞

Show inline comments

@@ @@ -162,30 +162,30 @@ static void ToggleTransparency() @@
 	MarkWholeScreenDirty();
+}
 static void MenuClickSettings(int index)
+{
 	switch (index) {
 		case 0: ShowGameOptions();      return;
 		case 1: ShowGameDifficulty();   return;
 		case 2: ShowPatchesSelection(); return;
 		case 3: ShowNewGRFSettings(!_networking, true, true, &_grfconfig);   return;
 		case  5: _display_opt ^= DO_SHOW_TOWN_NAMES;    break;
 		case  6: _display_opt ^= DO_SHOW_STATION_NAMES; break;
 		case  7: _display_opt ^= DO_SHOW_SIGNS;         break;
 		case  8: _display_opt ^= DO_WAYPOINTS;          break;
 		case  9: _display_opt ^= DO_FULL_ANIMATION;     break;
 		case 10: _display_opt ^= DO_FULL_DETAIL;        break;
 		case  5: TOGGLEBIT(_display_opt, DO_SHOW_TOWN_NAMES);    break;
 		case  6: TOGGLEBIT(_display_opt, DO_SHOW_STATION_NAMES); break;
 		case  7: TOGGLEBIT(_display_opt, DO_SHOW_SIGNS);         break;
 		case  8: TOGGLEBIT(_display_opt, DO_WAYPOINTS);          break;
 		case  9: TOGGLEBIT(_display_opt, DO_FULL_ANIMATION);     break;
 		case 10: TOGGLEBIT(_display_opt, DO_FULL_DETAIL);        break;
 		case 11: ToggleTransparency(); break;
 		case 12: TOGGLEBIT(_transparent_opt, TO_SIGNS); break;
+	}
 	MarkWholeScreenDirty();
+}
 static void MenuClickSaveLoad(int index)
+{
 	if (_game_mode == GM_EDITOR) {
 		switch (index) {
 			case 0: ShowSaveLoadDialog(SLD_SAVE_SCENARIO);  break;
 			case 1: ShowSaveLoadDialog(SLD_LOAD_SCENARIO);  break;
@@ @@ -965,30 +965,30 @@ static void ToolbarNewspaperClick(Window @@
 static void ToolbarHelpClick(Window *w)
+{
 	PopupMainToolbMenu(w, 26, STR_02D5_LAND_BLOCK_INFO, 6, 0);
+}
 static void ToolbarOptionsClick(Window *w)
+{
 	uint16 x = 0;
 	w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 13, 0);
 	if (_display_opt & DO_SHOW_TOWN_NAMES)    SETBIT(x,  5);
 	if (_display_opt & DO_SHOW_STATION_NAMES) SETBIT(x,  6);
 	if (_display_opt & DO_SHOW_SIGNS)         SETBIT(x,  7);
 	if (_display_opt & DO_WAYPOINTS)          SETBIT(x,  8);
 	if (_display_opt & DO_FULL_ANIMATION)     SETBIT(x,  9);
 	if (_display_opt & DO_FULL_DETAIL)        SETBIT(x, 10);
 	if (HASBIT(_display_opt, DO_SHOW_TOWN_NAMES))    SETBIT(x,  5);
 	if (HASBIT(_display_opt, DO_SHOW_STATION_NAMES)) SETBIT(x,  6);
 	if (HASBIT(_display_opt, DO_SHOW_SIGNS))         SETBIT(x,  7);
 	if (HASBIT(_display_opt, DO_WAYPOINTS))          SETBIT(x,  8);
 	if (HASBIT(_display_opt, DO_FULL_ANIMATION))     SETBIT(x,  9);
 	if (HASBIT(_display_opt, DO_FULL_DETAIL))        SETBIT(x, 10);
 	if (GB(_transparent_opt, 1, 7) != 0)      SETBIT(x, 11);
 	if (HASBIT(_transparent_opt, TO_SIGNS))   SETBIT(x, 12);
 	WP(w,menu_d).checked_items = x;
+}
 static void ToolbarScenSaveOrLoad(Window *w)
+{
 	PopupMainToolbMenu(w, 3, STR_0292_SAVE_SCENARIO, 6, 0);
+}
 static void ToolbarScenDateBackward(Window *w)

src/openttd.cpp

➞

Show inline comments

@@ @@ -1067,25 +1067,25 @@ void GameLoop() @@
 		if (_network_reconnect > 0 && --_network_reconnect == 0) {
 			/* This means that we want to reconnect to the last host
 			 * We do this here, because it means that the network is really closed */
 			NetworkClientConnectGame(_network_last_host, _network_last_port);
+		}
 		/* Singleplayer */
 		StateGameLoop();
+	}
 #else
 	StateGameLoop();
 #endif /* ENABLE_NETWORK */
-	if (!_pause_game && _display_opt & DO_FULL_ANIMATION) DoPaletteAnimations();
+	if (!_pause_game && HASBIT(_display_opt, DO_FULL_ANIMATION)) DoPaletteAnimations();
 	if (!_pause_game || _cheats.build_in_pause.value) MoveAllTextEffects();
 	InputLoop();
 	MusicLoop();
+}
 void BeforeSaveGame()
+{
 	const Window *w = FindWindowById(WC_MAIN_WINDOW, 0);

src/openttd.h

➞

Show inline comments

@@ @@ -162,30 +162,30 @@ typedef TinyEnumT<TransportType> Transpo @@
 struct TileInfo {
 	uint x;
 	uint y;
 	Slope tileh;
 	TileIndex tile;
 	uint z;
 };
 /* Display Options */
 enum {
 	DO_SHOW_TOWN_NAMES    = 1 << 0,
 	DO_SHOW_STATION_NAMES = 1 << 1,
 	DO_SHOW_SIGNS         = 1 << 2,
 	DO_FULL_ANIMATION     = 1 << 3,
 	DO_FULL_DETAIL        = 1 << 5,
 	DO_WAYPOINTS          = 1 << 6,
 	DO_SHOW_TOWN_NAMES    = 0,
 	DO_SHOW_STATION_NAMES = 1,
 	DO_SHOW_SIGNS         = 2,
 	DO_FULL_ANIMATION     = 3,
 	DO_FULL_DETAIL        = 5,
 	DO_WAYPOINTS          = 6,
 };
 enum {
 	TO_SIGNS,
 	TO_TREES,
 	TO_HOUSES,
 	TO_INDUSTRIES,
 	TO_BUILDINGS,
 	TO_BRIDGES,
 	TO_STRUCTURES,
 };

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -1313,25 +1313,25 @@ static void DrawSignals(TileIndex tile, @@
 static void DrawTile_Track(TileInfo *ti)
+{
 	const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile));
 	SpriteID image;
 	_drawtile_track_palette = PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile));
 	if (IsPlainRailTile(ti->tile)) {
 		TrackBits rails = GetTrackBits(ti->tile);
 		DrawTrackBits(ti, rails);
-		if (_display_opt & DO_FULL_DETAIL) DrawTrackDetails(ti);
+		if (HASBIT(_display_opt, DO_FULL_DETAIL)) DrawTrackDetails(ti);
 		if (HasSignals(ti->tile)) DrawSignals(ti->tile, rails);
 	} else {
 		/* draw depot/waypoint */
 		const DrawTileSprites* dts;
 		const DrawTileSeqStruct* dtss;
 		uint32 relocation;
 		if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, ti->tileh);
 		if (IsRailDepot(ti->tile)) {
 			dts = &_depot_gfx_table[GetRailDepotDirection(ti->tile)];

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -716,25 +716,25 @@ static void DrawRoadBits(TileInfo* ti) @@
+		}
+	}
 	DrawGroundSprite(image, pal);
 	if (HasRoadWorks(ti->tile)) {
 		/* Road works */
 		DrawGroundSprite(road & ROAD_X ? SPR_EXCAVATION_X : SPR_EXCAVATION_Y, PAL_NONE);
 		return;
+	}
 	/* Return if full detail is disabled, or we are zoomed fully out. */
-	if (!(_display_opt & DO_FULL_DETAIL) || _cur_dpi->zoom == 2) return;
+	if (!HASBIT(_display_opt, DO_FULL_DETAIL) || _cur_dpi->zoom == 2) return;
 	/* Draw extra details. */
 	for (drts = _road_display_table[roadside][road]; drts->image != 0; drts++) {
 		int x = ti->x | drts->subcoord_x;
 		int y = ti->y | drts->subcoord_y;
 		byte z = ti->z;
 		if (ti->tileh != SLOPE_FLAT) z = GetSlopeZ(x, y);
 		AddSortableSpriteToDraw(drts->image, PAL_NONE, x, y, 2, 2, 0x10, z);
+	}
+}
 static void DrawTile_Road(TileInfo *ti)

src/viewport.cpp

➞

Show inline comments

@@ @@ -790,25 +790,25 @@ static void ViewportAddLandscape() @@
 		} else {
 			x += 0x10;
+		}
 	} while (--height);
+}
 static void ViewportAddTownNames(DrawPixelInfo *dpi)
+{
 	Town *t;
 	int left, top, right, bottom;
-	if (!(_display_opt & DO_SHOW_TOWN_NAMES) || _game_mode == GM_MENU)
+	if (!HASBIT(_display_opt, DO_SHOW_TOWN_NAMES) || _game_mode == GM_MENU)
 		return;
 	left = dpi->left;
 	top = dpi->top;
 	right = left + dpi->width;
 	bottom = top + dpi->height;
 	switch (dpi->zoom) {
 		case 0:
 			FOR_ALL_TOWNS(t) {
 				if (bottom > t->sign.top &&
 						top    < t->sign.top + 12 &&
@@ @@ -864,25 +864,25 @@ static void AddStation(const Station *st @@
 	if (sstd != NULL) {
 		sstd->color = (st->owner == OWNER_NONE || st->facilities == 0) ? 0xE : _player_colors[st->owner];
 		sstd->width = width;
+	}
+}
 static void ViewportAddStationNames(DrawPixelInfo *dpi)
+{
 	int left, top, right, bottom;
 	const Station *st;
-	if (!(_display_opt & DO_SHOW_STATION_NAMES) || _game_mode == GM_MENU)
+	if (!HASBIT(_display_opt, DO_SHOW_STATION_NAMES) || _game_mode == GM_MENU)
 		return;
 	left = dpi->left;
 	top = dpi->top;
 	right = left + dpi->width;
 	bottom = top + dpi->height;
 	switch (dpi->zoom) {
 		case 0:
 			FOR_ALL_STATIONS(st) {
 				if (bottom > st->sign.top &&
 						top    < st->sign.top + 12 &&
@@ @@ -931,25 +931,25 @@ static void AddSign(const Sign *si, Stri @@
 	if (sstd != NULL) {
 		sstd->color = (si->owner == OWNER_NONE) ? 14 : _player_colors[si->owner];
 		sstd->width = width;
+	}
+}
 static void ViewportAddSigns(DrawPixelInfo *dpi)
+{
 	const Sign *si;
 	int left, top, right, bottom;
-	if (!(_display_opt & DO_SHOW_SIGNS))
+	if (!HASBIT(_display_opt, DO_SHOW_SIGNS))
 		return;
 	left = dpi->left;
 	top = dpi->top;
 	right = left + dpi->width;
 	bottom = top + dpi->height;
 	switch (dpi->zoom) {
 		case 0:
 			FOR_ALL_SIGNS(si) {
 				if (bottom > si->sign.top &&
 						top    < si->sign.top + 12 &&
@@ @@ -998,25 +998,25 @@ static void AddWaypoint(const Waypoint * @@
 	if (sstd != NULL) {
 		sstd->color = (wp->deleted ? 0xE : 11);
 		sstd->width = width;
+	}
+}
 static void ViewportAddWaypoints(DrawPixelInfo *dpi)
+{
 	const Waypoint *wp;
 	int left, top, right, bottom;
-	if (!(_display_opt & DO_WAYPOINTS))
+	if (!HASBIT(_display_opt, DO_WAYPOINTS))
 		return;
 	left = dpi->left;
 	top = dpi->top;
 	right = left + dpi->width;
 	bottom = top + dpi->height;
 	switch (dpi->zoom) {
 		case 0:
 			FOR_ALL_WAYPOINTS(wp) {
 				if (bottom > wp->sign.top &&
 						top    < wp->sign.top + 12 &&
@@ @@ -1478,25 +1478,25 @@ static void SetSelectionTilesDirty() @@
 void SetSelectionRed(bool b)
+{
 	_thd.make_square_red = b;
 	SetSelectionTilesDirty();
+}
 static bool CheckClickOnTown(const ViewPort *vp, int x, int y)
+{
 	const Town *t;
-	if (!(_display_opt & DO_SHOW_TOWN_NAMES)) return false;
+	if (!HASBIT(_display_opt, DO_SHOW_TOWN_NAMES)) return false;
 	switch (vp->zoom) {
 		case 0:
 			x = x - vp->left + vp->virtual_left;
 			y = y - vp->top  + vp->virtual_top;
 			FOR_ALL_TOWNS(t) {
 				if (y >= t->sign.top &&
 						y < t->sign.top + 12 &&
 						x >= t->sign.left &&
 						x < t->sign.left + t->sign.width_1) {
 					ShowTownViewWindow(t->index);
 					return true;
@@ @@ -1532,25 +1532,25 @@ static bool CheckClickOnTown(const ViewP @@
+			}
 			break;
+	}
 	return false;
+}
 static bool CheckClickOnStation(const ViewPort *vp, int x, int y)
+{
 	const Station *st;
-	if (!(_display_opt & DO_SHOW_STATION_NAMES)) return false;
+	if (!HASBIT(_display_opt, DO_SHOW_STATION_NAMES)) return false;
 	switch (vp->zoom) {
 		case 0:
 			x = x - vp->left + vp->virtual_left;
 			y = y - vp->top  + vp->virtual_top;
 			FOR_ALL_STATIONS(st) {
 				if (y >= st->sign.top &&
 						y < st->sign.top + 12 &&
 						x >= st->sign.left &&
 						x < st->sign.left + st->sign.width_1) {
 					ShowStationViewWindow(st->index);
 					return true;
@@ @@ -1586,25 +1586,25 @@ static bool CheckClickOnStation(const Vi @@
+			}
 			break;
+	}
 	return false;
+}
 static bool CheckClickOnSign(const ViewPort *vp, int x, int y)
+{
 	const Sign *si;
-	if (!(_display_opt & DO_SHOW_SIGNS) || _current_player == PLAYER_SPECTATOR) return false;
+	if (!HASBIT(_display_opt, DO_SHOW_SIGNS) || _current_player == PLAYER_SPECTATOR) return false;
 	switch (vp->zoom) {
 		case 0:
 			x = x - vp->left + vp->virtual_left;
 			y = y - vp->top  + vp->virtual_top;
 			FOR_ALL_SIGNS(si) {
 				if (y >= si->sign.top &&
 						y <  si->sign.top + 12 &&
 						x >= si->sign.left &&
 						x <  si->sign.left + si->sign.width_1) {
 					ShowRenameSignWindow(si);
 					return true;
@@ @@ -1640,25 +1640,25 @@ static bool CheckClickOnSign(const ViewP @@
+			}
 			break;
+	}
 	return false;
+}
 static bool CheckClickOnWaypoint(const ViewPort *vp, int x, int y)
+{
 	const Waypoint *wp;
-	if (!(_display_opt & DO_WAYPOINTS)) return false;
+	if (!HASBIT(_display_opt, DO_WAYPOINTS)) return false;
 	switch (vp->zoom) {
 		case 0:
 			x = x - vp->left + vp->virtual_left;
 			y = y - vp->top  + vp->virtual_top;
 			FOR_ALL_WAYPOINTS(wp) {
 				if (y >= wp->sign.top &&
 						y < wp->sign.top + 12 &&
 						x >= wp->sign.left &&
 						x < wp->sign.left + wp->sign.width_1) {
 					ShowRenameWaypointWindow(wp);
 					return true;

0 comments (0 inline, 0 general)