Files
@ r18989:156eeb86b09e
Branch filter:
Location: cpp/openttd-patchpack/source/src/timetable_cmd.cpp - annotation
r18989:156eeb86b09e
11.4 KiB
text/x-c
(svn r23855) -Fix [FS#5007]: out of bounds read for slowdown parameter caused desync when railtype >= 4, vehicles were fast, and the original acceleration model was used
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 | r6981:8e1c715f9e05 r6981:8e1c715f9e05 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r8116:df67d3c5e4fd r17263:a75c87f7e037 r13757:cb9ca7946c57 r8131:7a50db7be0ff r8144:1432edd15267 r6981:8e1c715f9e05 r8264:d493cb51fe8a r6981:8e1c715f9e05 r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r7066:7459a71fc283 r7066:7459a71fc283 r11986:6596046384a5 r10546:a4ec290c1c46 r7066:7459a71fc283 r7066:7459a71fc283 r10546:a4ec290c1c46 r7066:7459a71fc283 r7066:7459a71fc283 r10546:a4ec290c1c46 r7066:7459a71fc283 r7066:7459a71fc283 r10546:a4ec290c1c46 r7066:7459a71fc283 r10033:424b14d0d013 r17184:a6dd7165a9b8 r10033:424b14d0d013 r10033:424b14d0d013 r10033:424b14d0d013 r10033:424b14d0d013 r10033:424b14d0d013 r7066:7459a71fc283 r13024:48c81d0b078a r7809:a8c0806e350f r7066:7459a71fc283 r7066:7459a71fc283 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r15878:2d36635f395d r15878:2d36635f395d r15878:2d36635f395d r6981:8e1c715f9e05 r6981:8e1c715f9e05 r15878:2d36635f395d r13057:58af81fcdcf8 r13057:58af81fcdcf8 r6981:8e1c715f9e05 r11090:9276cea703d4 r6981:8e1c715f9e05 r15878:2d36635f395d r6981:8e1c715f9e05 r11944:3b8f9f948e8d r14805:8c416234ced2 r14805:8c416234ced2 r14805:8c416234ced2 r14805:8c416234ced2 r6981:8e1c715f9e05 r15878:2d36635f395d r11986:6596046384a5 r17683:ed148d83dec5 r6981:8e1c715f9e05 r15878:2d36635f395d r9665:f312055347cc r10227:5c84b06816db r10227:5c84b06816db r15877:3aed46ca22cb r9665:f312055347cc r9641:a78fbf5c85cc r9665:f312055347cc r6981:8e1c715f9e05 r6981:8e1c715f9e05 r10227:5c84b06816db r9665:f312055347cc r9665:f312055347cc r12622:202e83a6cee7 r9665:f312055347cc r9665:f312055347cc r9665:f312055347cc r9665:f312055347cc r9665:f312055347cc r12622:202e83a6cee7 r9665:f312055347cc r9665:f312055347cc r9665:f312055347cc r10227:5c84b06816db r9665:f312055347cc r6981:8e1c715f9e05 r10227:5c84b06816db r10227:5c84b06816db r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r15878:2d36635f395d r13057:58af81fcdcf8 r13057:58af81fcdcf8 r13057:58af81fcdcf8 r6981:8e1c715f9e05 r11090:9276cea703d4 r6981:8e1c715f9e05 r15878:2d36635f395d r6981:8e1c715f9e05 r11944:3b8f9f948e8d r14805:8c416234ced2 r14805:8c416234ced2 r14805:8c416234ced2 r14805:8c416234ced2 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r13755:bf4fbd1c24d2 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r7066:7459a71fc283 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r15858:d75fb1dcda49 r15858:d75fb1dcda49 r15858:d75fb1dcda49 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r15878:2d36635f395d r14805:8c416234ced2 r14805:8c416234ced2 r14805:8c416234ced2 r14805:8c416234ced2 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r7066:7459a71fc283 r7066:7459a71fc283 r7066:7459a71fc283 r7066:7459a71fc283 r7066:7459a71fc283 r7066:7459a71fc283 r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r13057:58af81fcdcf8 r13057:58af81fcdcf8 r7066:7459a71fc283 r11090:9276cea703d4 r7066:7459a71fc283 r15878:2d36635f395d r7066:7459a71fc283 r11944:3b8f9f948e8d r14805:8c416234ced2 r14805:8c416234ced2 r14805:8c416234ced2 r14805:8c416234ced2 r7066:7459a71fc283 r7066:7459a71fc283 r10341:c21fa463ba20 r10677:1a6f3c7876cf r10677:1a6f3c7876cf r10677:1a6f3c7876cf r7931:4c17a74c399e r7929:67846e70abf8 r7066:7459a71fc283 r10677:1a6f3c7876cf r10341:c21fa463ba20 r7066:7459a71fc283 r13757:cb9ca7946c57 r10341:c21fa463ba20 r7066:7459a71fc283 r7929:67846e70abf8 r10341:c21fa463ba20 r7066:7459a71fc283 r7066:7459a71fc283 r16915:70e55512434f r16915:70e55512434f r16915:70e55512434f r16915:70e55512434f r16915:70e55512434f r16915:70e55512434f r16915:70e55512434f r11042:9a00dc9e0e93 r7809:a8c0806e350f r7809:a8c0806e350f r7066:7459a71fc283 r7066:7459a71fc283 r6981:8e1c715f9e05 r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r17683:ed148d83dec5 r16897:d3b3d1abd708 r16897:d3b3d1abd708 r17683:ed148d83dec5 r16897:d3b3d1abd708 r16897:d3b3d1abd708 r7066:7459a71fc283 r10341:c21fa463ba20 r10341:c21fa463ba20 r13757:cb9ca7946c57 r17184:a6dd7165a9b8 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r13757:cb9ca7946c57 r8970:a7dc16677ffd r13757:cb9ca7946c57 r8970:a7dc16677ffd r7066:7459a71fc283 r7928:a80e7e05d6c5 r7066:7459a71fc283 r8970:a7dc16677ffd r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r7066:7459a71fc283 r7066:7459a71fc283 r17084:c81e0e9afe2e r17084:c81e0e9afe2e r17084:c81e0e9afe2e r17084:c81e0e9afe2e r17084:c81e0e9afe2e r17084:c81e0e9afe2e r17084:c81e0e9afe2e r17084:c81e0e9afe2e r7066:7459a71fc283 r17184:a6dd7165a9b8 r10341:c21fa463ba20 r10341:c21fa463ba20 r17184:a6dd7165a9b8 r10341:c21fa463ba20 r10341:c21fa463ba20 r10341:c21fa463ba20 r7929:67846e70abf8 r10341:c21fa463ba20 r7066:7459a71fc283 r10341:c21fa463ba20 r8970:a7dc16677ffd r7066:7459a71fc283 r10341:c21fa463ba20 r10341:c21fa463ba20 r7062:6a1de70754de r7062:6a1de70754de r7062:6a1de70754de r7066:7459a71fc283 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r6981:8e1c715f9e05 r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r17085:00941d1d17ff r9941:945cc0c6ccbc r13024:48c81d0b078a r7809:a8c0806e350f r6981:8e1c715f9e05 | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file timetable_cmd.cpp Commands related to time tabling. */
#include "stdafx.h"
#include "command_func.h"
#include "company_func.h"
#include "date_func.h"
#include "window_func.h"
#include "vehicle_base.h"
#include "table/strings.h"
/**
* Change/update a particular timetable entry.
* @param v The vehicle to change the timetable of.
* @param order_number The index of the timetable in the order list.
* @param time The new time of the timetable entry.
* @param is_journey Whether to set the waiting or travelling time.
*/
static void ChangeTimetable(Vehicle *v, VehicleOrderID order_number, uint16 time, bool is_journey)
{
Order *order = v->GetOrder(order_number);
int delta;
if (is_journey) {
delta = time - order->travel_time;
order->travel_time = time;
} else {
delta = time - order->wait_time;
order->wait_time = time;
}
v->orders.list->UpdateOrderTimetable(delta);
for (v = v->FirstShared(); v != NULL; v = v->NextShared()) {
if (v->cur_real_order_index == order_number && v->current_order.Equals(*order)) {
if (is_journey) {
v->current_order.travel_time = time;
} else {
v->current_order.wait_time = time;
}
}
SetWindowDirty(WC_VEHICLE_TIMETABLE, v->index);
}
}
/**
* Add or remove waiting times from an order.
* @param tile Not used.
* @param flags Operation to perform.
* @param p1 Various bitstuffed elements
* - p1 = (bit 0-19) - Vehicle with the orders to change.
* - p1 = (bit 20-27) - Order index to modify.
* - p1 = (bit 28) - Whether to change the waiting time or the travelling
* time.
* @param p2 The amount of time to wait.
* - p2 = (bit 0-15) - Waiting or travelling time as specified by p1 bit 28
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
VehicleID veh = GB(p1, 0, 20);
Vehicle *v = Vehicle::GetIfValid(veh);
if (v == NULL || !v->IsPrimaryVehicle()) return CMD_ERROR;
CommandCost ret = CheckOwnership(v->owner);
if (ret.Failed()) return ret;
VehicleOrderID order_number = GB(p1, 20, 8);
Order *order = v->GetOrder(order_number);
if (order == NULL || order->IsType(OT_IMPLICIT)) return CMD_ERROR;
bool is_journey = HasBit(p1, 28);
int wait_time = order->wait_time;
int travel_time = order->travel_time;
if (is_journey) {
travel_time = GB(p2, 0, 16);
} else {
wait_time = GB(p2, 0, 16);
}
if (wait_time != order->wait_time) {
switch (order->GetType()) {
case OT_GOTO_STATION:
if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_ERROR_TIMETABLE_NOT_STOPPING_HERE);
break;
case OT_CONDITIONAL:
break;
default: return_cmd_error(STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS);
}
}
if (travel_time != order->travel_time && order->IsType(OT_CONDITIONAL)) return CMD_ERROR;
if (flags & DC_EXEC) {
if (wait_time != order->wait_time) ChangeTimetable(v, order_number, wait_time, false);
if (travel_time != order->travel_time) ChangeTimetable(v, order_number, travel_time, true);
}
return CommandCost();
}
/**
* Clear the lateness counter to make the vehicle on time.
* @param tile Not used.
* @param flags Operation to perform.
* @param p1 Various bitstuffed elements
* - p1 = (bit 0-19) - Vehicle with the orders to change.
* @param p2 unused
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdSetVehicleOnTime(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
VehicleID veh = GB(p1, 0, 20);
Vehicle *v = Vehicle::GetIfValid(veh);
if (v == NULL || !v->IsPrimaryVehicle()) return CMD_ERROR;
CommandCost ret = CheckOwnership(v->owner);
if (ret.Failed()) return ret;
if (flags & DC_EXEC) {
v->lateness_counter = 0;
SetWindowDirty(WC_VEHICLE_TIMETABLE, v->index);
}
return CommandCost();
}
/**
* Set the start date of the timetable.
* @param tile Not used.
* @param flags Operation to perform.
* @param p1 Vehicle id.
* @param p2 The timetable start date.
* @param text Not used.
* @return The error or cost of the operation.
*/
CommandCost CmdSetTimetableStart(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
Vehicle *v = Vehicle::GetIfValid(GB(p1, 0, 20));
if (v == NULL || !v->IsPrimaryVehicle()) return CMD_ERROR;
CommandCost ret = CheckOwnership(v->owner);
if (ret.Failed()) return ret;
/* Don't let a timetable start more than 15 years into the future or 1 year in the past. */
Date start_date = (Date)p2;
if (start_date < 0 || start_date > MAX_DAY) return CMD_ERROR;
if (start_date - _date > 15 * DAYS_IN_LEAP_YEAR) return CMD_ERROR;
if (_date - start_date > DAYS_IN_LEAP_YEAR) return CMD_ERROR;
if (flags & DC_EXEC) {
v->lateness_counter = 0;
ClrBit(v->vehicle_flags, VF_TIMETABLE_STARTED);
v->timetable_start = start_date;
SetWindowDirty(WC_VEHICLE_TIMETABLE, v->index);
}
return CommandCost();
}
/**
* Start or stop filling the timetable automatically from the time the vehicle
* actually takes to complete it. When starting to autofill the current times
* are cleared and the timetable will start again from scratch.
* @param tile Not used.
* @param flags Operation to perform.
* @param p1 Vehicle index.
* @param p2 Various bitstuffed elements
* - p2 = (bit 0) - Set to 1 to enable, 0 to disable autofill.
* - p2 = (bit 1) - Set to 1 to preserve waiting times in non-destructive mode
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdAutofillTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
VehicleID veh = GB(p1, 0, 20);
Vehicle *v = Vehicle::GetIfValid(veh);
if (v == NULL || !v->IsPrimaryVehicle()) return CMD_ERROR;
CommandCost ret = CheckOwnership(v->owner);
if (ret.Failed()) return ret;
if (flags & DC_EXEC) {
if (HasBit(p2, 0)) {
/* Start autofilling the timetable, which clears the
* "timetable has started" bit. Times are not cleared anymore, but are
* overwritten when the order is reached now. */
SetBit(v->vehicle_flags, VF_AUTOFILL_TIMETABLE);
ClrBit(v->vehicle_flags, VF_TIMETABLE_STARTED);
/* Overwrite waiting times only if they got longer */
if (HasBit(p2, 1)) SetBit(v->vehicle_flags, VF_AUTOFILL_PRES_WAIT_TIME);
v->timetable_start = 0;
v->lateness_counter = 0;
} else {
ClrBit(v->vehicle_flags, VF_AUTOFILL_TIMETABLE);
ClrBit(v->vehicle_flags, VF_AUTOFILL_PRES_WAIT_TIME);
}
for (Vehicle *v2 = v->FirstShared(); v2 != NULL; v2 = v2->NextShared()) {
if (v2 != v) {
/* Stop autofilling; only one vehicle at a time can perform autofill */
ClrBit(v2->vehicle_flags, VF_AUTOFILL_TIMETABLE);
ClrBit(v2->vehicle_flags, VF_AUTOFILL_PRES_WAIT_TIME);
}
SetWindowDirty(WC_VEHICLE_TIMETABLE, v2->index);
}
}
return CommandCost();
}
/**
* Update the timetable for the vehicle.
* @param v The vehicle to update the timetable for.
* @param travelling Whether we just travelled or waited at a station.
*/
void UpdateVehicleTimetable(Vehicle *v, bool travelling)
{
uint timetabled = travelling ? v->current_order.travel_time : v->current_order.wait_time;
uint time_taken = v->current_order_time;
v->current_order_time = 0;
if (v->current_order.IsType(OT_IMPLICIT)) return; // no timetabling of auto orders
VehicleOrderID first_manual_order = 0;
for (Order *o = v->GetFirstOrder(); o != NULL && o->IsType(OT_IMPLICIT); o = o->next) {
++first_manual_order;
}
bool just_started = false;
/* This vehicle is arriving at the first destination in the timetable. */
if (v->cur_real_order_index == first_manual_order && travelling) {
/* If the start date hasn't been set, or it was set automatically when
* the vehicle last arrived at the first destination, update it to the
* current time. Otherwise set the late counter appropriately to when
* the vehicle should have arrived. */
just_started = !HasBit(v->vehicle_flags, VF_TIMETABLE_STARTED);
if (v->timetable_start != 0) {
v->lateness_counter = (_date - v->timetable_start) * DAY_TICKS + _date_fract;
v->timetable_start = 0;
}
SetBit(v->vehicle_flags, VF_TIMETABLE_STARTED);
SetWindowDirty(WC_VEHICLE_TIMETABLE, v->index);
}
if (!HasBit(v->vehicle_flags, VF_TIMETABLE_STARTED)) return;
if (HasBit(v->vehicle_flags, VF_AUTOFILL_TIMETABLE)) {
if (travelling && !HasBit(v->vehicle_flags, VF_AUTOFILL_PRES_WAIT_TIME)) {
/* Need to clear that now as otherwise we are not able to reduce the wait time */
v->current_order.wait_time = 0;
}
if (just_started) return;
/* Modify station waiting time only if our new value is larger (this is
* always the case when we cleared the timetable). */
if (!v->current_order.IsType(OT_CONDITIONAL) && (travelling || time_taken > v->current_order.wait_time)) {
/* Round the time taken up to the nearest day, as this will avoid
* confusion for people who are timetabling in days, and can be
* adjusted later by people who aren't.
* For trains/aircraft multiple movement cycles are done in one
* tick. This makes it possible to leave the station and process
* e.g. a depot order in the same tick, causing it to not fill
* the timetable entry like is done for road vehicles/ships.
* Thus always make sure at least one tick is used between the
* processing of different orders when filling the timetable. */
time_taken = CeilDiv(max(time_taken, 1U), DAY_TICKS) * DAY_TICKS;
ChangeTimetable(v, v->cur_real_order_index, time_taken, travelling);
}
if (v->cur_real_order_index == first_manual_order && travelling) {
/* If we just started we would have returned earlier and have not reached
* this code. So obviously, we have completed our round: So turn autofill
* off again. */
ClrBit(v->vehicle_flags, VF_AUTOFILL_TIMETABLE);
ClrBit(v->vehicle_flags, VF_AUTOFILL_PRES_WAIT_TIME);
}
return;
}
if (just_started) return;
/* Vehicles will wait at stations if they arrive early even if they are not
* timetabled to wait there, so make sure the lateness counter is updated
* when this happens. */
if (timetabled == 0 && (travelling || v->lateness_counter >= 0)) return;
v->lateness_counter -= (timetabled - time_taken);
/* When we are more late than this timetabled bit takes we (somewhat expensively)
* check how many ticks the (fully filled) timetable has. If a timetable cycle is
* shorter than the amount of ticks we are late we reduce the lateness by the
* length of a full cycle till lateness is less than the length of a timetable
* cycle. When the timetable isn't fully filled the cycle will be INVALID_TICKS. */
if (v->lateness_counter > (int)timetabled) {
Ticks cycle = v->orders.list->GetTimetableTotalDuration();
if (cycle != INVALID_TICKS && v->lateness_counter > cycle) {
v->lateness_counter %= cycle;
}
}
for (v = v->FirstShared(); v != NULL; v = v->NextShared()) {
SetWindowDirty(WC_VEHICLE_TIMETABLE, v->index);
}
}
|