mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r11485) -Codechange: Remove the doubled function ToggleBitT and rename the remaining to fit with the naming style

This commit is contained in:
skidd13 2007-11-20 14:11:19 +00:00
parent eeaa348f8b
commit a91c2a4c39
15 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aircraft_cmd.cpp
View File

@ -574,7 +574,7 @@ CommandCost CmdSendAircraftToHangar(TileIndex tile, uint32 flags, uint32 p1, uin
* Note: the if is (true for requesting service == true for ordered to stop in hangar) */ * Note: the if is (true for requesting service == true for ordered to stop in hangar) */
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS); ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS);
TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); ToggleBit(v->current_order.flags, OFB_HALT_IN_DEPOT);
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
} }
return CommandCost(); return CommandCost();

4
src/graph_gui.cpp
View File

@ -281,7 +281,7 @@ static void GraphLegendWndProc(Window *w, WindowEvent *e)
case WE_CLICK: case WE_CLICK:
if (!IS_INT_INSIDE(e->we.click.widget, 3, 11)) return; if (!IS_INT_INSIDE(e->we.click.widget, 3, 11)) return;
TOGGLEBIT(_legend_excluded_players, e->we.click.widget - 3); ToggleBit(_legend_excluded_players, e->we.click.widget - 3);
ToggleWidgetLoweredState(w, e->we.click.widget); ToggleWidgetLoweredState(w, e->we.click.widget);
SetWindowDirty(w); SetWindowDirty(w);
InvalidateWindow(WC_INCOME_GRAPH, 0); InvalidateWindow(WC_INCOME_GRAPH, 0);
@ -760,7 +760,7 @@ static void CargoPaymentRatesWndProc(Window *w, WindowEvent *e)
case WE_CLICK: case WE_CLICK:
if (e->we.click.widget >= 3) { if (e->we.click.widget >= 3) {
TOGGLEBIT(_legend_excluded_cargo, e->we.click.widget - 3); ToggleBit(_legend_excluded_cargo, e->we.click.widget - 3);
ToggleWidgetLoweredState(w, e->we.click.widget); ToggleWidgetLoweredState(w, e->we.click.widget);
SetWindowDirty(w); SetWindowDirty(w);
} }

5
src/helpers.hpp
View File

@ -149,11 +149,6 @@ template <typename Tenum_t> struct TinyEnumT
} }
}; };
template <typename T> void ToggleBitT(T &t, int bit_index)
{
t = (T)(t ^ ((T)1 << bit_index));
}
/** /**
* Overflow safe template for integers, i.e. integers that will never overflow * Overflow safe template for integers, i.e. integers that will never overflow
* you multiply the maximum value with 2, or add 2, or substract somethng from * you multiply the maximum value with 2, or add 2, or substract somethng from

4
src/macros.h
View File

@ -279,9 +279,9 @@ template<typename T> static inline T ClrBit(T& x, const uint8 y)
* @param y The bit position to toggle * @param y The bit position to toggle
* @return The new value of the old value with the bit toggled * @return The new value of the old value with the bit toggled
*/ */
template<typename T> static inline T TOGGLEBIT(T& x, const uint8 y) template<typename T> static inline T ToggleBit(T& x, const uint8 y)
{ {
return x ^= (T)1U << y; return x = (T)(x ^ (T)(1U << y));
} }

12
src/main_gui.cpp
View File

@ -167,12 +167,12 @@ static void MenuClickSettings(int index)
case 3: ShowNewGRFSettings(!_networking, true, true, &_grfconfig); return; case 3: ShowNewGRFSettings(!_networking, true, true, &_grfconfig); return;
case 4: ShowTransparencyToolbar(); break; case 4: ShowTransparencyToolbar(); break;
case 6: TOGGLEBIT(_display_opt, DO_SHOW_TOWN_NAMES); break; case 6: ToggleBit(_display_opt, DO_SHOW_TOWN_NAMES); break;
case 7: TOGGLEBIT(_display_opt, DO_SHOW_STATION_NAMES); break; case 7: ToggleBit(_display_opt, DO_SHOW_STATION_NAMES); break;
case 8: TOGGLEBIT(_display_opt, DO_SHOW_SIGNS); break; case 8: ToggleBit(_display_opt, DO_SHOW_SIGNS); break;
case 9: TOGGLEBIT(_display_opt, DO_WAYPOINTS); break; case 9: ToggleBit(_display_opt, DO_WAYPOINTS); break;
case 10: TOGGLEBIT(_display_opt, DO_FULL_ANIMATION); break; case 10: ToggleBit(_display_opt, DO_FULL_ANIMATION); break;
case 11: TOGGLEBIT(_display_opt, DO_FULL_DETAIL); break; case 11: ToggleBit(_display_opt, DO_FULL_DETAIL); break;
case 12: case 12:
ToggleTransparency(TO_TREES); ToggleTransparency(TO_TREES);
ToggleTransparency(TO_HOUSES); ToggleTransparency(TO_HOUSES);

10
src/order_cmd.cpp
View File

@ -685,18 +685,18 @@ CommandCost CmdModifyOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
switch (p2) { switch (p2) {
case OFB_FULL_LOAD: case OFB_FULL_LOAD:
TOGGLEBIT(order->flags, OFB_FULL_LOAD); ToggleBit(order->flags, OFB_FULL_LOAD);
if (order->type != OT_GOTO_DEPOT) ClrBit(order->flags, OFB_UNLOAD); if (order->type != OT_GOTO_DEPOT) ClrBit(order->flags, OFB_UNLOAD);
break; break;
case OFB_UNLOAD: case OFB_UNLOAD:
TOGGLEBIT(order->flags, OFB_UNLOAD); ToggleBit(order->flags, OFB_UNLOAD);
ClrBit(order->flags, OFB_FULL_LOAD); ClrBit(order->flags, OFB_FULL_LOAD);
break; break;
case OFB_NON_STOP: case OFB_NON_STOP:
TOGGLEBIT(order->flags, OFB_NON_STOP); ToggleBit(order->flags, OFB_NON_STOP);
break; break;
case OFB_TRANSFER: case OFB_TRANSFER:
TOGGLEBIT(order->flags, OFB_TRANSFER); ToggleBit(order->flags, OFB_TRANSFER);
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
@ -720,7 +720,7 @@ CommandCost CmdModifyOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (sel_ord == u->cur_order_index && if (sel_ord == u->cur_order_index &&
u->current_order.type != OT_GOTO_DEPOT && u->current_order.type != OT_GOTO_DEPOT &&
HasBit(u->current_order.flags, OFB_FULL_LOAD) != HasBit(order->flags, OFB_FULL_LOAD)) { HasBit(u->current_order.flags, OFB_FULL_LOAD) != HasBit(order->flags, OFB_FULL_LOAD)) {
TOGGLEBIT(u->current_order.flags, OFB_FULL_LOAD); ToggleBit(u->current_order.flags, OFB_FULL_LOAD);
} }
InvalidateVehicleOrder(u); InvalidateVehicleOrder(u);
} }

2
src/player_gui.cpp
View File

@ -402,7 +402,7 @@ static void SelectPlayerLiveryWndProc(Window *w, WindowEvent *e)
} }
if (_ctrl_pressed) { if (_ctrl_pressed) {
TOGGLEBIT(WP(w, livery_d).sel, j); ToggleBit(WP(w, livery_d).sel, j);
} else { } else {
WP(w, livery_d).sel = 1 << j; WP(w, livery_d).sel = 1 << j;
} }

4
src/rail_cmd.cpp
View File

@ -666,7 +666,7 @@ static CommandCost CmdRailTrackHelper(TileIndex tile, uint32 flags, uint32 p1, u
tile += ToTileIndexDiff(_trackdelta[trackdir]); tile += ToTileIndexDiff(_trackdelta[trackdir]);
/* toggle railbit for the non-diagonal tracks */ /* toggle railbit for the non-diagonal tracks */
if (!IsDiagonalTrackdir(trackdir)) ToggleBitT(trackdir, 0); if (!IsDiagonalTrackdir(trackdir)) ToggleBit(trackdir, 0);
} }
return (total_cost.GetCost() == 0) ? CMD_ERROR : total_cost; return (total_cost.GetCost() == 0) ? CMD_ERROR : total_cost;
@ -1033,7 +1033,7 @@ static CommandCost CmdSignalTrackHelper(TileIndex tile, uint32 flags, uint32 p1,
if (IsDiagonalTrackdir(trackdir)) { if (IsDiagonalTrackdir(trackdir)) {
signal_ctr++; signal_ctr++;
} else { } else {
ToggleBitT(trackdir, 0); ToggleBit(trackdir, 0);
} }
} }
} }

2
src/road_map.h
View File

@ -218,7 +218,7 @@ static inline bool IsOnSnow(TileIndex t)
#define ToggleDesert ToggleSnow #define ToggleDesert ToggleSnow
static inline void ToggleSnow(TileIndex t) static inline void ToggleSnow(TileIndex t)
{ {
TOGGLEBIT(_m[t].m3, 7); ToggleBit(_m[t].m3, 7);
} }

2
src/roadveh_cmd.cpp
View File

@ -482,7 +482,7 @@ CommandCost CmdSendRoadVehToDepot(TileIndex tile, uint32 flags, uint32 p1, uint3
* Note: the if is (true for requesting service == true for ordered to stop in depot) */ * Note: the if is (true for requesting service == true for ordered to stop in depot) */
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS); ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS);
TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); ToggleBit(v->current_order.flags, OFB_HALT_IN_DEPOT);
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
} }
return CommandCost(); return CommandCost();

2
src/ship_cmd.cpp
View File

@ -1010,7 +1010,7 @@ CommandCost CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p
* Note: the if is (true for requesting service == true for ordered to stop in depot) */ * Note: the if is (true for requesting service == true for ordered to stop in depot) */
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS); ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS);
TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); ToggleBit(v->current_order.flags, OFB_HALT_IN_DEPOT);
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
} }
return CommandCost(); return CommandCost();

4
src/station_gui.cpp
View File

@ -400,7 +400,7 @@ static void PlayerStationsWndProc(Window *w, WindowEvent *e)
case STATIONLIST_WIDGET_AIRPLANE: case STATIONLIST_WIDGET_AIRPLANE:
case STATIONLIST_WIDGET_SHIP: case STATIONLIST_WIDGET_SHIP:
if (_ctrl_pressed) { if (_ctrl_pressed) {
TOGGLEBIT(facilities, e->we.click.widget - STATIONLIST_WIDGET_TRAIN); ToggleBit(facilities, e->we.click.widget - STATIONLIST_WIDGET_TRAIN);
ToggleWidgetLoweredState(w, e->we.click.widget); ToggleWidgetLoweredState(w, e->we.click.widget);
} else { } else {
for (uint i = 0; facilities != 0; i++, facilities >>= 1) { for (uint i = 0; facilities != 0; i++, facilities >>= 1) {
@ -487,7 +487,7 @@ static void PlayerStationsWndProc(Window *w, WindowEvent *e)
} }
if (_ctrl_pressed) { if (_ctrl_pressed) {
TOGGLEBIT(_cargo_filter, c); ToggleBit(_cargo_filter, c);
ToggleWidgetLoweredState(w, e->we.click.widget); ToggleWidgetLoweredState(w, e->we.click.widget);
} else { } else {
for (uint i = STATIONLIST_WIDGET_CARGOSTART; i < w->widget_count; i++) { for (uint i = STATIONLIST_WIDGET_CARGOSTART; i < w->widget_count; i++) {

6
src/train_cmd.cpp
View File

@ -1651,7 +1651,7 @@ CommandCost CmdReverseTrainDirection(TileIndex tile, uint32 flags, uint32 p1, ui
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
TOGGLEBIT(v->u.rail.flags, VRF_REVERSE_DIRECTION); ToggleBit(v->u.rail.flags, VRF_REVERSE_DIRECTION);
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
} }
@ -1661,7 +1661,7 @@ CommandCost CmdReverseTrainDirection(TileIndex tile, uint32 flags, uint32 p1, ui
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (_patches.realistic_acceleration && v->cur_speed != 0) { if (_patches.realistic_acceleration && v->cur_speed != 0) {
TOGGLEBIT(v->u.rail.flags, VRF_REVERSING); ToggleBit(v->u.rail.flags, VRF_REVERSING);
} else { } else {
v->cur_speed = 0; v->cur_speed = 0;
SetLastSpeed(v, 0); SetLastSpeed(v, 0);
@ -1908,7 +1908,7 @@ CommandCost CmdSendTrainToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32
* Note: the if is (true for requesting service == true for ordered to stop in depot) */ * Note: the if is (true for requesting service == true for ordered to stop in depot) */
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS); ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS);
TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); ToggleBit(v->current_order.flags, OFB_HALT_IN_DEPOT);
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
} }
return CommandCost(); return CommandCost();

2
src/transparency.h
View File

@ -45,7 +45,7 @@ static inline bool IsTransparencySet(TransparencyOption to)
*/ */
static inline void ToggleTransparency(TransparencyOption to) static inline void ToggleTransparency(TransparencyOption to)
{ {
TOGGLEBIT(_transparency_opt, to); ToggleBit(_transparency_opt, to);
} }
/** Toggle all transparency options (except signs) or restore the stored transparencies */ /** Toggle all transparency options (except signs) or restore the stored transparencies */

2
src/window.h
View File

@ -714,7 +714,7 @@ static inline void SetWindowWidgetLoweredState(Window *w, byte widget_index, boo
static inline void ToggleWidgetLoweredState(Window *w, byte widget_index) static inline void ToggleWidgetLoweredState(Window *w, byte widget_index)
{ {
assert(widget_index < w->widget_count); assert(widget_index < w->widget_count);
TOGGLEBIT(w->widget[widget_index].display_flags, WIDG_LOWERED); ToggleBit(w->widget[widget_index].display_flags, WIDG_LOWERED);
} }
/** /**