Mercurial > hg > openttd
changeset 8350:8cde0dcc6818 draft
(svn r11916) -Codechange: use enums from VehicleViewWindowWidgets instead of constants
-Fix: refit button widget was not correctly updated
author | smatz <smatz@openttd.org> |
---|---|
date | Fri, 18 Jan 2008 13:02:47 +0000 |
parents | cbb2e614bcfa |
children | b5c490dc1ee7 |
files | src/aircraft_cmd.cpp src/roadveh_cmd.cpp src/ship_cmd.cpp src/train_cmd.cpp src/vehicle.cpp src/vehicle_func.h src/vehicle_gui.cpp src/vehicle_gui.h src/water_cmd.cpp |
diffstat | 9 files changed, 61 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -537,7 +537,7 @@ v->vehstatus ^= VS_STOPPED; v->cur_speed = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); InvalidateWindowClasses(WC_AIRCRAFT_LIST); } @@ -576,7 +576,7 @@ if (flags & DC_EXEC) { ClrBit(v->current_order.flags, OF_PART_OF_ORDERS); ToggleBit(v->current_order.flags, OF_HALT_IN_DEPOT); - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return CommandCost(); } @@ -586,7 +586,7 @@ if (v->current_order.flags & OFB_UNLOAD) v->cur_order_index++; v->current_order.type = OT_DUMMY; v->current_order.flags = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } } else { bool next_airport_has_hangar = true; @@ -610,7 +610,7 @@ if (!(p2 & DEPOT_SERVICE)) SetBit(v->current_order.flags, OF_HALT_IN_DEPOT); v->current_order.refit_cargo = CT_INVALID; v->current_order.dest = next_airport_index; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); if (v->u.air.state == FLYING && !next_airport_has_hangar) { /* The aircraft is now heading for a different hangar than the next in the orders */ AircraftNextAirportPos_and_Order(v); @@ -715,11 +715,11 @@ // v->u.air.targetairport = st->index; v->current_order.type = OT_GOTO_DEPOT; v->current_order.flags = OFB_NON_STOP; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } else if (v->current_order.type == OT_GOTO_DEPOT) { v->current_order.type = OT_DUMMY; v->current_order.flags = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } } @@ -941,7 +941,7 @@ if (spd != v->cur_speed) { v->cur_speed = spd; if (_patches.vehicle_speed) - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } if (!(v->direction & 1)) spd = spd * 3 / 4;
--- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -314,7 +314,7 @@ v->vehstatus ^= VS_STOPPED; v->cur_speed = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); } @@ -486,7 +486,7 @@ if (flags & DC_EXEC) { ClrBit(v->current_order.flags, OF_PART_OF_ORDERS); ToggleBit(v->current_order.flags, OF_HALT_IN_DEPOT); - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return CommandCost(); } @@ -500,7 +500,7 @@ v->current_order.type = OT_DUMMY; v->current_order.flags = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return CommandCost(); } @@ -518,7 +518,7 @@ v->current_order.refit_cargo = CT_INVALID; v->current_order.dest = dep->index; v->dest_tile = dep->xy; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return CommandCost(); @@ -694,7 +694,7 @@ ClearSlot(v); - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); SetDParam(0, pass); AddNewsItem( @@ -963,7 +963,7 @@ if (spd != v->cur_speed) { v->cur_speed = spd; if (_patches.vehicle_speed) { - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } } @@ -1892,7 +1892,7 @@ } StartRoadVehSound(v); - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } /* Check tile position conditions - i.e. stop position in depot, @@ -1983,7 +1983,7 @@ if (v->current_order.type == OT_GOTO_DEPOT) { v->current_order.type = OT_DUMMY; v->current_order.flags = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return; } @@ -2001,7 +2001,7 @@ v->current_order.flags = OFB_NON_STOP; v->current_order.dest = depot->index; v->dest_tile = depot->xy; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } void OnNewDay_RoadVeh(Vehicle *v)
--- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -158,7 +158,7 @@ if (v->current_order.type == OT_GOTO_DEPOT) { v->current_order.type = OT_DUMMY; v->current_order.flags = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return; } @@ -167,7 +167,7 @@ v->current_order.flags = OFB_NON_STOP; v->current_order.dest = depot->index; v->dest_tile = depot->xy; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } void OnNewDay_Ship(Vehicle *v) @@ -386,7 +386,7 @@ if (spd != v->cur_speed) { v->cur_speed = spd; if (_patches.vehicle_speed) - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } /* Decrease somewhat when turning */ @@ -683,7 +683,7 @@ * always skip ahead. */ if (v->current_order.type == OT_LEAVESTATION) { v->current_order.Free(); - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } else if (v->dest_tile != 0) { /* We have a target, let's see if we reached it... */ if (v->current_order.type == OT_GOTO_STATION && @@ -961,7 +961,7 @@ v->vehstatus ^= VS_STOPPED; v->cur_speed = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); InvalidateWindowClasses(WC_SHIPS_LIST); } @@ -1007,7 +1007,7 @@ if (flags & DC_EXEC) { ClrBit(v->current_order.flags, OF_PART_OF_ORDERS); ToggleBit(v->current_order.flags, OF_HALT_IN_DEPOT); - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return CommandCost(); } @@ -1021,7 +1021,7 @@ v->current_order.type = OT_DUMMY; v->current_order.flags = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return CommandCost(); } @@ -1038,7 +1038,7 @@ if (!(p2 & DEPOT_SERVICE)) SetBit(v->current_order.flags, OF_HALT_IN_DEPOT); v->current_order.refit_cargo = CT_INVALID; v->current_order.dest = dep->index; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return CommandCost();
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -132,7 +132,7 @@ v->u.rail.cached_power = total_power; v->u.rail.cached_max_te = max_te; InvalidateWindow(WC_VEHICLE_DETAILS, v->index); - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } } @@ -1247,7 +1247,7 @@ InvalidateWindow(WC_VEHICLE_DETAILS, src_head->index); /* Update the refit button and window */ InvalidateWindow(WC_VEHICLE_REFIT, src_head->index); - InvalidateWindowWidget(WC_VEHICLE_VIEW, src_head->index, 12); + InvalidateWindowWidget(WC_VEHICLE_VIEW, src_head->index, VVW_WIDGET_REFIT_VEH); } /* Update the depot window */ InvalidateWindow(WC_VEHICLE_DEPOT, src_head->tile); @@ -1261,7 +1261,7 @@ UpdateTrainAcceleration(dst_head); InvalidateWindow(WC_VEHICLE_DETAILS, dst_head->index); /* Update the refit button and window */ - InvalidateWindowWidget(WC_VEHICLE_VIEW, dst_head->index, 12); + InvalidateWindowWidget(WC_VEHICLE_VIEW, dst_head->index, VVW_WIDGET_REFIT_VEH); InvalidateWindow(WC_VEHICLE_REFIT, dst_head->index); } /* Update the depot window */ @@ -1304,7 +1304,7 @@ } v->vehstatus ^= VS_STOPPED; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); } return CommandCost(); @@ -1549,7 +1549,7 @@ if (spd != old) { v->u.rail.last_speed = spd; if (_patches.vehicle_speed || (old == 0) != (spd == 0)) - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } } @@ -2062,7 +2062,7 @@ if (flags & DC_EXEC) { ClrBit(v->current_order.flags, OF_PART_OF_ORDERS); ToggleBit(v->current_order.flags, OF_HALT_IN_DEPOT); - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return CommandCost(); } @@ -2075,7 +2075,7 @@ v->current_order.type = OT_DUMMY; v->current_order.flags = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return CommandCost(); } @@ -2096,7 +2096,7 @@ if (!(p2 & DEPOT_SERVICE)) SetBit(v->current_order.flags, OF_HALT_IN_DEPOT); v->current_order.dest = GetDepotByTile(tfdd.tile)->index; v->current_order.refit_cargo = CT_INVALID; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); /* If there is no depot in front, reverse automatically */ if (tfdd.reverse) DoCommand(v->tile, v->index, 0, DC_EXEC, CMD_REVERSE_TRAIN_DIRECTION); } @@ -2844,7 +2844,7 @@ v->u.rail.crash_anim_pos++; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); InvalidateWindow(WC_VEHICLE_DETAILS, v->index); if (v->u.rail.track == TRACK_BIT_DEPOT) { @@ -2995,7 +2995,7 @@ if (v->current_order.type == OT_LEAVESTATION) { v->current_order.Free(); - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } } } else { @@ -3588,7 +3588,7 @@ * schedule? */ v->current_order.type = OT_DUMMY; v->current_order.flags = 0; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } return; } @@ -3605,7 +3605,7 @@ v->current_order.flags = OFB_NON_STOP; v->current_order.dest = depot->index; v->dest_tile = tfdd.tile; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } void OnNewDay_Train(Vehicle *v)
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -3131,7 +3131,7 @@ VehiclePayment(this); InvalidateWindow(this->GetVehicleListWindowClass(), this->owner); - InvalidateWindowWidget(WC_VEHICLE_VIEW, this->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, this->index, VVW_WIDGET_START_STOP_VEH); InvalidateWindow(WC_VEHICLE_DETAILS, this->index); InvalidateWindow(WC_STATION_VIEW, this->last_station_visited); @@ -3222,7 +3222,7 @@ /* Code ripped from CmdStartStopTrain. Can't call it, because of * ownership problems, so we'll duplicate some code, for now */ v->vehstatus |= VS_STOPPED; - InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); } }
--- a/src/vehicle_func.h +++ b/src/vehicle_func.h @@ -133,10 +133,6 @@ */ SpriteID GetVehiclePalette(const Vehicle *v); -/* A lot of code calls for the invalidation of the status bar, which is widget 5. - * Best is to have a virtual value for it when it needs to change again */ -#define STATUS_BAR 5 - extern const uint32 _veh_build_proc_table[]; extern const uint32 _veh_sell_proc_table[]; extern const uint32 _veh_refit_proc_table[];
--- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1645,26 +1645,6 @@ /* Unified vehicle GUI - Vehicle View Window */ -/** Constants of vehicle view widget indices */ -enum VehicleViewWindowWidgets { - VVW_WIDGET_CLOSEBOX = 0, - VVW_WIDGET_CAPTION, - VVW_WIDGET_STICKY, - VVW_WIDGET_PANEL, - VVW_WIDGET_VIEWPORT, - VVW_WIDGET_START_STOP_VEH, - VVW_WIDGET_CENTER_MAIN_VIEH, - VVW_WIDGET_GOTO_DEPOT, - VVW_WIDGET_REFIT_VEH, - VVW_WIDGET_SHOW_ORDERS, - VVW_WIDGET_SHOW_DETAILS, - VVW_WIDGET_CLONE_VEH, - VVW_WIDGET_EMPTY_BOTTOM_RIGHT, - VVW_WIDGET_RESIZE, - VVW_WIDGET_TURN_AROUND, - VVW_WIDGET_FORCE_PROCEED, -}; - /** Vehicle view widgets. */ static const Widget _vehicle_view_widgets[] = { { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW }, // VVW_WIDGET_CLOSEBOX
--- a/src/vehicle_gui.h +++ b/src/vehicle_gui.h @@ -22,7 +22,27 @@ extern const StringID _vehicle_sort_listing[]; -/* Start of functions regarding vehicle list windows */ +/** Constants of vehicle view widget indices */ +enum VehicleViewWindowWidgets { + VVW_WIDGET_CLOSEBOX = 0, + VVW_WIDGET_CAPTION, + VVW_WIDGET_STICKY, + VVW_WIDGET_PANEL, + VVW_WIDGET_VIEWPORT, + VVW_WIDGET_START_STOP_VEH, + VVW_WIDGET_CENTER_MAIN_VIEH, + VVW_WIDGET_GOTO_DEPOT, + VVW_WIDGET_REFIT_VEH, + VVW_WIDGET_SHOW_ORDERS, + VVW_WIDGET_SHOW_DETAILS, + VVW_WIDGET_CLONE_VEH, + VVW_WIDGET_EMPTY_BOTTOM_RIGHT, + VVW_WIDGET_RESIZE, + VVW_WIDGET_TURN_AROUND, + VVW_WIDGET_FORCE_PROCEED, +}; + +/** Start of functions regarding vehicle list windows */ enum { PLY_WND_PRC__OFFSET_TOP_WIDGET = 26, PLY_WND_PRC__SIZE_OF_ROW_TINY = 13, @@ -31,7 +51,7 @@ PLY_WND_PRC__SIZE_OF_ROW_BIG2 = 39, }; -/* Vehicle List Window type flags */ +/** Vehicle List Window type flags */ enum { VLW_STANDARD = 0 << 8, VLW_SHARED_ORDERS = 1 << 8,