Commit Graph

729 Commits (2af2a498875ceeb00021b1f0b2e7fb1dea69f5df)

Author SHA1 Message Date
Jonathan G Rennison 2af2a49887 Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation"
This reverts commit 166e504c13.

These parameters are used for tracerestrict functionality.
8 years ago
Jonathan G Rennison f9f2d37a8e Merge branch 'master' into tracerestrict
# Conflicts:
#	src/saveload/saveload.cpp
8 years ago
peter1138 166e504c13 (svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
8 years ago
peter1138 040df26e9e (svn r27809) -Codechange: Improve check in UpdateLevelCrossing
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
8 years ago
Jonathan G Rennison f5e4d8e73a Merge branch 'master' into tracerestrict
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
8 years ago
frosch a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 8 years ago
frosch f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 8 years ago
frosch 2a1e955fee (svn r27663) -Codechange: Deduplicate code when rotating crashed vehicles. 8 years ago
frosch c9f68ede59 (svn r27580) -Fix [FS#6395]: Set date of last service on construction also for wagons and articulated parts. 8 years ago
Jonathan G Rennison 1bb3024534 Fix unreserving through a green PBS signal not setting the state to red.
This also had the side effect of failed reservation attempts through
a reserve-through signal leaving the signal erroneously set to green.
9 years ago
Jonathan G Rennison 817ce019ca Fix use of nullptr which breaks compilation on legacy compilers. 9 years ago
patch-import 82cab7f31c Tracerestrict: Import "Long Reserve" feature.
https://github.com/KeldorKatarn/OpenTTD_PatchPack

Minor code de-duplications.
9 years ago
frosch 51787a3465 (svn r27419) -Fix [FS#6369]: CmdSellRailWagon did not revert all actions properly when no orderlist could be allocated. (Juanjo) 9 years ago
Jonathan G Rennison 06a1d7c5c9 Add reserve through action to trace restrict programs.
This only changes the behaviour of PBS reservations which
would otherwise terminate at a PBS signal.
If the signal restriction sets the reserve through state,
the reservation continues through the signal, and the signal
is set to green.
9 years ago
frosch bba85a6e01 (svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads. 10 years ago
frosch 8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 10 years ago
rubidium 0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 10 years ago
peter1138 f7f49c15a3 (svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists. 10 years ago
peter1138 49dafc0848 (svn r26907) -Codechange: Scale engine purchase list to GUI zoom level for multihead engines. 10 years ago
rubidium ac269a3f08 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 10 years ago
fonsinchen d49dad9f9c (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 11 years ago
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 11 years ago
frosch eb6974179d (svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to. 11 years ago
rubidium a498a56573 (svn r26130) -Codechange: add some guards against using invalid image indices 11 years ago
rubidium f84b67ea73 (svn r26129) -Fix: remove dead code; it could be made to do what it did, but then it would be inconsistent with moving vehicles around 11 years ago
rubidium 14f5d55f6c (svn r26126) -Cleanup: remove unneeded check for NULL 11 years ago
frosch f12d0c09ec (svn r26026) -Fix (r25648) [FS#5775-ish]: Invalidate vehicle colour palette again when rearranging consist, reversing, ... 11 years ago
rubidium 41d9da548d (svn r25955) -Fix [FS#5723]: Train's "force proceed" status gets reset when the track on the other side of the tile has a signal (adf88) 11 years ago
frosch 6bceb8b7ab (svn r25946) -Add: [NewGRF Debuggnig] Inspecting other vehicles in a chain. 11 years ago
frosch 4fe2a3d75d (svn r25744) -Fix (r25648): [NewGRF] Also invalidate vehicle colour palette when rearranging consists. 11 years ago
frosch 34c9d8b77c (svn r25698) -Fix [FS#5700]: Autoreplace/renew also refits free wagons. 11 years ago
frosch 206616bf37 (svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading. 11 years ago
rubidium 46df11b74a (svn r25319) -Fix [FS#5570]: crash when train with reserved cargo vanishes 11 years ago
rubidium 6b746167e4 (svn r25259) -Codechange: track capacities and usage of links 12 years ago
michi_cc ac13b8baa0 (svn r25200) -Fix (r24846): The level crossing sound is an ambient sound and not a new year sound. 12 years ago
frosch c5d7445704 (svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen) 12 years ago
frosch e2db0c5e26 (svn r25167) -Fix [FS#5523] (r24832): Original train and rv acceleration did no longer respect bridge speed limits. 12 years ago
rubidium 58ec317c5a (svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138) 12 years ago
rubidium 2c67dc3d9f (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 12 years ago
peter1138 1e10e91fde (svn r24905) -Feature(ish): Implement station randomisation triggers. 12 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
frosch 336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 12 years ago
michi_cc bac2b4c25d (svn r24839) -Feature [FS#5271]: [NewGRF] Support oversized purchase list sprites. (Based on patch by Eddi) 12 years ago
michi_cc 68b078761d (svn r24834) -Fix [FS#5396]: The autorefit dropdown in the order GUI wasn't always updated when modifying vehicle consists. 12 years ago
michi_cc 37da99ab90 (svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum. 12 years ago
michi_cc 009d20e990 (svn r24832) -Fix [FS#5397]: [NewGRF] Take bridge speed limits into account for vehicle variable 4C. 12 years ago
michi_cc 36ccbe5188 (svn r24831) -Fix [FS#5398]: [NewGRF] Incorrect values are better than a crash when a NewGRF queries vehicle variable 4C before vehicle initialisation is completed. 12 years ago
frosch 076e69a2d8 (svn r24713) -Fix [FS#5262]: [NewGRF] Tolerate old NewGRFs returning invalid values via CB 11. 12 years ago
frosch 358a2bd6ed (svn r24384) -Fix [FS#5188-ish]: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked. 12 years ago
frosch df9a6d24a0 (svn r24382) -Fix: Call Vehicle::IsStoppedInDepot only for the first vehicle in a chain (i.e. primary vehicle or free wagon). 12 years ago