Jonathan G Rennison f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp ...

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h

2016-09-18 20:07:48 +01:00

..

afterload.cpp

Merge branch 'signal_tunnels_bridges' into jgrpp

2016-09-18 20:07:48 +01:00

ai_sl.cpp

(svn r26493) -Codechange: use strecat to concatenate script settings instead of manually accounting for the amount of characters that has been written

2014-04-24 04:41:54 +00:00

airport_sl.cpp

(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

2014-04-23 20:13:33 +00:00

animated_tile_sl.cpp

(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

2014-04-23 20:13:33 +00:00

autoreplace_sl.cpp

(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

2014-04-23 20:13:33 +00:00

bridge_signal_sl.cpp

Extend bridge signal simulation to support an unlimited no. of signals.

2016-09-18 20:06:59 +01:00

cargomonitor_sl.cpp

(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

2014-04-23 20:13:33 +00:00

cargopacket_sl.cpp

(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

2014-04-23 20:13:33 +00:00

cheat_sl.cpp

(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

2014-04-23 20:13:33 +00:00

company_sl.cpp

Merge branch 'auto_timetables-sx' into jgrpp

2016-05-08 01:13:35 +01:00

depot_sl.cpp

(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

2014-04-23 20:13:33 +00:00

economy_sl.cpp

Remove save-only autolength flag from economy chunk handlers

2016-09-07 18:47:32 +01:00

engine_sl.cpp

(svn r27243) -Fix (r26816) [FS#6285]: Duplicate frees due to pool item classes not having copy constructors.

2015-04-23 20:07:07 +00:00

extended_ver_sl.cpp

Merge branch 'signal_tunnels_bridges' into jgrpp

2016-09-18 20:07:48 +01:00

extended_ver_sl.h

Merge branch 'save_ext' into signal_tunnels_bridges

2016-09-18 13:53:01 +01:00

game_sl.cpp

(svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments

2014-10-12 18:41:53 +00:00

gamelog_sl.cpp

No longer truncate savegame version in gamelog.

2016-09-08 21:22:39 +01:00

goal_sl.cpp

(svn r26593) -Fix: Goals were saved/loaded with incorrect size.

2014-05-17 17:18:07 +00:00

group_sl.cpp

(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

2014-04-23 20:13:33 +00:00

industry_sl.cpp

(svn r27291) -Fix (r27278) [FS#6303]: Some savegame data was discarded again during loading.

2015-05-21 18:59:11 +00:00

labelmaps_sl.cpp

(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

2014-04-23 20:13:33 +00:00

linkgraph_sl.cpp

Add setting for linkgraph times to be in non daylength scaled days.

2016-01-29 00:26:47 +00:00

map_sl.cpp

Show error message instead of aborting when loading an invalid map size.

2015-09-12 13:33:35 +01:00

misc_sl.cpp

Replace day length scaled tick macros with global variables.

2016-09-10 01:03:48 +01:00

newgrf_sl.cpp

(svn r27278) -Fix: Handle savegames with an unexpected amount of industry-builder or NewGRF entity-mapping more gracefully.

2015-05-09 10:04:50 +00:00

newgrf_sl.h

…

object_sl.cpp

(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

2014-04-23 20:13:33 +00:00

oldloader_sl.cpp

(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable

2014-09-21 11:23:33 +00:00

oldloader.cpp

Fix file descriptor leak in LoadOldSaveGame

2016-09-07 19:15:04 +01:00

oldloader.h

…

order_sl.cpp

Merge branch 'cargo_type_order' into jgrpp

2016-09-08 00:12:48 +01:00

plans_sl.cpp

Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch

2015-08-05 21:24:30 +01:00

saveload_filter.h

…

saveload_internal.h

Merge branch 'template_train_replacement-sx' into jgrpp

2016-02-16 21:08:21 +00:00

saveload.cpp

Merge branch 'signal_tunnels_bridges' into jgrpp

2016-09-18 20:07:48 +01:00

saveload.h

Merge branch 'save_ext' into jgrpp

2016-09-13 22:57:08 +01:00

signal_sl.cpp

Progsig: Fix some benign compiler warnings and whitespace issues.

2015-08-16 16:57:24 +01:00

signs_sl.cpp

(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.

2016-09-04 12:57:43 +00:00

station_sl.cpp

Use vector instead of list for Station::loading_vehicles.

2016-09-13 22:58:00 +01:00

storage_sl.cpp

(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

2014-04-23 20:13:33 +00:00

story_sl.cpp

(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

2014-04-23 20:13:33 +00:00

strings_sl.cpp

(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)

2014-04-25 15:40:32 +00:00

subsidy_sl.cpp

(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

2014-04-23 20:13:33 +00:00

tbtr_template_replacement_sl.cpp

Squashed commit of the following:

2016-02-13 19:26:47 +00:00

tbtr_template_veh_sl.cpp

Fix AfterLoadTemplateVehiclesUpdateImage clobbering the random seeds.

2016-03-21 21:18:22 +00:00

town_sl.cpp

Remove impossible conditional in RealSave_Town

2016-09-07 18:47:47 +01:00

tracerestrict_sl.cpp

Validate type of all instructions, log validation failures at load.

2015-09-02 20:51:30 +01:00

vehicle_sl.cpp

Use a deque instead of list for CargoPacketList and StationCargoPacketMap.

2016-09-13 22:58:00 +01:00

waypoint_sl.cpp

(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

2014-04-23 20:13:33 +00:00