Jonathan G Rennison
2af2a49887
Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation"
...
This reverts commit 166e504c13
.
These parameters are used for tracerestrict functionality.
2017-03-20 19:16:32 +00:00
Jonathan G Rennison
f9f2d37a8e
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/saveload/saveload.cpp
2017-03-20 19:14:48 +00:00
peter1138
5baf52b938
(svn r27814) -Change: Remove _roadveh_depot_exit_trackdir
...
_roadveh_depot_exit_trackdir was just a copy of
DiagDirToDiagTrackdir. (cirdan)
2017-03-20 18:16:23 +00:00
peter1138
c03ccdb36b
(svn r27813) -Change: Remove _road_enter_dir_to_reachable_trackdirs
...
_road_enter_dir_to_reachable_trackdirs was just a copy of
DiagdirReachesTrackdirs. (cirdan)
2017-03-20 18:14:22 +00:00
peter1138
380e1a240f
(svn r27812) -Fix: Road tunnel/bridge heads have no trackbits wrt catenary drawing
...
Road tunnels and bridges do not have any rail, so do not treat them
as if they had when drawing a catenary. (cirdan)
2017-03-20 17:57:24 +00:00
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)
2017-03-20 17:49:44 +00:00
peter1138
4107f78eae
(svn r27810) -Change: Factor out reservation-handling code in station_cmd.cpp
...
Code dealing with freeing and restoring track reservations is
duplicated in CmdBuildRailStation and RemoveFromRailBaseStation;
make separate functions for it. (cirdan)
2017-03-20 17:44:37 +00:00
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)
2017-03-20 08:04:47 +00:00
peter1138
e3a1ae2be5
(svn r27808) -Codechange: Adjust the size of _track_crosses_trackdirs
...
_track_crosses_trackdirs is indexed by a Track, not a
Trackdir, so adjust its size accordingly. (cirdan)
2017-03-19 22:30:47 +00:00
peter1138
80303515c1
(svn r27807) -Codechange: Remove _ship_leave_depot_offs
...
There is already TileOffsByDiagDir for that. (cirdan)
2017-03-19 22:02:20 +00:00
peter1138
54ec06258a
(svn r27806) -Codechange: Remove function ShipGetNewDirection
...
ShipGetNewDirection has no side effects and its return value
is ignored by its only caller, so do away with it.
Also remove now unused _new_vehicle_direction_table. (cirdan)
2017-03-19 21:59:24 +00:00
peter1138
f0062f94d6
(svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles
...
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
2017-03-19 21:57:54 +00:00
translators
bf30576255
(svn r27804) -Update from Eints:
...
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
2017-03-19 18:45:38 +00:00
alberth
17b46109ad
(svn r27803) -Change: Remove obsolete aircraft preview strings from other languages
2017-03-18 20:49:24 +00:00
alberth
1f70279419
(svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu)
2017-03-18 20:48:54 +00:00
alberth
119965125d
(svn r27801) -Change: Also rename long aircraft preview window strings of other languages
2017-03-18 20:48:27 +00:00
alberth
b110c9c259
(svn r27800) -Change: Rename long aircraft string names of the preview window
2017-03-18 20:47:48 +00:00
alberth
fa5fd39c23
(svn r27799) -Add: Display aircraft type in buy window (patch by Samu)
2017-03-18 20:46:15 +00:00
alberth
7c3004c785
(svn r27798) -Change: Also remove obsolete string from the other languages
2017-03-18 20:45:18 +00:00
alberth
e2e9bd0b25
(svn r27797) -Add: Display aircraft type in its vehicle window (patch by Samu)
2017-03-18 20:43:43 +00:00
frosch
206a0838e9
(svn r27796) -Fix [FS#6545]: 32bpp-anim blitters assumed that pitch and width of the screen were equal.
2017-03-18 17:14:53 +00:00
translators
5c7f97aff2
(svn r27795) -Update from Eints:
...
luxembourgish: 3 changes by Phreeze
2017-03-14 18:45:36 +00:00
peter1138
36837a070c
(svn r27794) -Fix [FS#6526]: Chat text background overflowed due to missing padding.
2017-03-14 00:57:52 +00:00
peter1138
57745b1c74
(svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status.
2017-03-13 22:16:44 +00:00
michi_cc
c706eeda81
(svn r27792) -Add: [Win32] .gitignore for IntelliSense database of VS2015 Update 2.
2017-03-13 21:56:41 +00:00
michi_cc
9a62317dfc
(svn r27791) -Fix (r27790) [FS#6366]: Try #2 . Now also for Visual Studio 2010.
2017-03-13 21:56:38 +00:00
michi_cc
2d45d55925
(svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input.
2017-03-13 20:21:40 +00:00
translators
9169ab6ce2
(svn r27789) -Update from Eints:
...
polish: 3 changes by wojteks86
greek: 1 change by kyrm
2017-03-13 18:45:37 +00:00
peter1138
a77044f185
(svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger.
2017-03-13 07:37:05 +00:00
peter1138
980871a87b
(svn r27787) -Fix: Update scrollbar when rebuilding AI/GS setting list.
2017-03-12 18:19:01 +00:00
peter1138
9a489375e3
(svn r27786) -Fix [FS#6479]: AI configuration changed incorrect parameter when some parameters are hidden.
2017-03-12 16:33:40 +00:00
peter1138
c366425de6
(svn r27785) -Fix [FS#6508]: Buoys not always drawn after being placed depending on zoom level (Samu).
2017-03-12 15:32:40 +00:00
peter1138
7501b7cf7a
(svn r27784) -Fix [FS#6505]: Allow rail conversion even if ship is on tile (Samu).
2017-03-12 15:26:31 +00:00
frosch
ed63b48e76
(svn r27780) -Update: Numbers
2017-03-11 20:50:26 +00:00
frosch
d3de080883
(svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames.
2017-03-11 20:37:32 +00:00
frosch
bc61ff380a
(svn r27777) -Doc: Yearly increment
2017-03-11 16:49:51 +00:00
frosch
ffcdd47321
(svn r27776) -Merge: Documentation updates from 1.6 branch
2017-03-11 13:34:01 +00:00
frosch
51c6ae62d1
(svn r27775) -Fix [FS#6510]: Insufficient thread synchronisation when switching blitters. (JGR)
2017-03-11 13:05:54 +00:00
frosch
5b7a04ca27
(svn r27774) -Fix [FS#5889]: Enabling palette animation for 32bpp blitters while paused skipped initialisation of the palette and resulted in black windows.
...
-Revert (r23978): No SDL-specific fix required anymore. The new fix applies to all backends.
2017-03-11 12:52:26 +00:00
frosch
f2af019eb7
(svn r27773) -Update: Baseset translations
2017-03-11 12:20:50 +00:00
frosch
5e28cc4757
(svn r27772) -Fix [FS#5819]: If the intro game had a savegame version which contains a NewGRF configuration, then townname NewGRFs would not be activated in the game options.
2017-03-07 20:18:54 +00:00
translators
4d12cce1c4
(svn r27771) -Update from Eints:
...
malay: 27 changes by stress_043
2017-03-07 18:45:38 +00:00
fonsinchen
0d5ee772fc
(svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR)
2017-03-05 17:06:14 +00:00
frosch
bc2382af06
(svn r27769) -Change: [NewGRF] Extend the DCxx range to D800-DFFF.
2017-03-05 14:45:13 +00:00
frosch
724f1f3b69
(svn r27768) -Codechange: Use if and IsInsideMM instead of switch-case sequences to test for consecutive values.
2017-03-05 14:44:15 +00:00
frosch
f469b0be3e
(svn r27767) -Codechange: Industries and houses should just use the default-case in Action 4.
2017-03-05 14:43:21 +00:00
frosch
4180276c81
(svn r27766) -Fix: Obiwan opposed translations for text id D3FF and DCFF in Action 13.
2017-03-05 14:42:41 +00:00
translators
3342c5a367
(svn r27765) -Update from Eints:
...
russian: 4 changes by Lone_Wolf
2017-03-04 18:45:36 +00:00
translators
d22b80779b
(svn r27764) -Update from Eints:
...
russian: 3 changes by Lone_Wolf
french: 6 changes by glx
2017-03-02 18:45:38 +00:00
translators
a8f9520bbd
(svn r27763) -Update from Eints:
...
korean: 6 changes by telk5093
frisian: 2 changes by Fopper
russian: 5 changes by Lone_Wolf
2017-03-01 18:45:37 +00:00