gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-11 08:49:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20569) -Cleanup: the change timetable command doesn't need the packed bit anymore

Browse Source
This commit is contained in:
rubidium 2010-08-19 20:32:33 +00:00
parent ca0cd109f2
commit 64c178467d
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/timetable_cmd.cpp
View File

@ -53,11 +53,8 @@ static void ChangeTimetable(Vehicle *v, VehicleOrderID order_number, uint16 time
* - p1 = (bit 16-23) - Order index to modify. * - p1 = (bit 16-23) - Order index to modify.
* - p1 = (bit 24) - Whether to change the waiting time or the travelling * - p1 = (bit 24) - Whether to change the waiting time or the travelling
* time. * time.
* - p1 = (bit 25) - Whether p2 contains waiting and travelling time.
* @param p2 The amount of time to wait. * @param p2 The amount of time to wait.
* - p2 = (bit 0-15) - Waiting or travelling time as specified by p1 bit 24 if p1 bit 25 is not set, * - p2 = (bit 0-15) - Waiting or travelling time as specified by p1 bit 24
* Travelling time if p1 bit 25 is set.
* - p2 = (bit 16-31) - Waiting time if p1 bit 25 is set
* @param text unused * @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
@ -77,15 +74,11 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u
Order *order = v->GetOrder(order_number); Order *order = v->GetOrder(order_number);
if (order == NULL) return CMD_ERROR; if (order == NULL) return CMD_ERROR;
bool packed_time = HasBit(p1, 25); bool is_journey = HasBit(p1, 24);
bool is_journey = HasBit(p1, 24) || packed_time;
int wait_time = order->wait_time; int wait_time = order->wait_time;
int travel_time = order->travel_time; int travel_time = order->travel_time;
if (packed_time) { if (is_journey) {
travel_time = GB(p2, 0, 16);
wait_time = GB(p2, 16, 16);
} else if (is_journey) {
travel_time = GB(p2, 0, 16); travel_time = GB(p2, 0, 16);
} else { } else {
wait_time = GB(p2, 0, 16); wait_time = GB(p2, 0, 16);