Commit Graph

927 Commits

Author SHA1 Message Date
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
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals.
This is instead of the previous limit of 16, all stored in M2.
2016-09-18 20:06:59 +01:00
Jonathan G Rennison
0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs.
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
2016-09-18 20:06:39 +01:00
Jonathan G Rennison
161f70eb4a Merge branch 'save_ext' into signal_tunnels_bridges 2016-09-18 13:53:01 +01:00
Jonathan G Rennison
021b72490f Mark SpringPP imports as fake extended savegame versions. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
e844b82d9e Use vector instead of list for Station::loading_vehicles. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
a422cb6753 Use a deque instead of list for CargoPacketList and StationCargoPacketMap. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
ae8e19cf9a Merge branch 'save_ext' into jgrpp 2016-09-13 22:57:08 +01:00
Jonathan G Rennison
d124089d29 Add extended version tag and feature versions to output of -q. 2016-09-13 22:56:17 +01:00
Jonathan G Rennison
94d3700f79 SaveLoad: Add support for saving/loading from a std::vector<T *> 2016-09-13 22:56:16 +01:00
Jonathan G Rennison
c752da3a9e SaveLoad: Add support for saving/loading from a std::deque<T *> 2016-09-13 22:56:16 +01:00
Jonathan G Rennison
888cd1be07 Merge branch 'cpp-11' into signal_tunnels_bridges
# Conflicts:
#	src/saveload/saveload.cpp
2016-09-11 13:16:54 +01:00
Jonathan G Rennison
375b069f82 Replace day length scaled tick macros with global variables.
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
2016-09-10 01:03:48 +01:00
Jonathan G Rennison
db026ec8b0 No longer truncate savegame version in gamelog.
Add an extended feature for changed savegame format.
2016-09-08 21:22:39 +01:00
Jonathan G Rennison
9ea018abc5 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
2016-09-08 00:12:48 +01:00
Jonathan G Rennison
5e67582a64 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
2016-09-07 22:02:57 +01:00
cirdan
c5e30b8f04 Fix file descriptor leak in LoadOldSaveGame
LoadOldSaveGame was leaking a file descriptor when it
successfully loaded a savegame.

(cherry picked from commit f47cfbbba0b182f116109e02445bb419fab1a157)
2016-09-07 19:15:04 +01:00
cirdan
293ce8b4ab Remove impossible conditional in RealSave_Town
Saving always uses the current savegame version SAVEGAME_VERSION,
which is non-decreasing and already greater than 166.

(cherry picked from commit 6b79497d380b3ae865ddf4d3efb71c319a2bb579)
2016-09-07 18:47:47 +01:00
cirdan
4a19babf9e Remove unused ChunkType flag CH_AUTO_LENGTH
CH_AUTO_LENGTH is no longer used anywhere, so remove all code
that depends on it.

(cherry picked from commit 9c620d9de5d45b78f7d992d6b3897009fe988d86)
2016-09-07 18:47:39 +01:00
cirdan
ec157b4a66 Remove save-only autolength flag from economy chunk handlers
CH_AUTO_LENGTH is only used when saving chunks; it makes no sense
to set it for chunks without a save handler.

(cherry picked from commit 8b2fe11d8491fb5f3b9bd7dd5344a0956817e41c)
2016-09-07 18:47:32 +01:00
Jonathan G Rennison
f8f8e642dc Use unique_ptr and initialiser init for OrderExtraInfo. 2016-09-06 22:10:18 +01:00
Jonathan G Rennison
72a386abe5 Merge branch 'save_ext' into cargo_type_order 2016-09-06 22:09:50 +01:00
Jonathan G Rennison
a3d0fc5817 Remove an unused extern declaration, update comment. 2016-09-05 23:31:34 +01:00
Jonathan G Rennison
a6e0b1ac7d Merge branch 'cpp-11' into save_ext 2016-09-05 23:17:02 +01:00
Jonathan G Rennison
871d26098e Move Order::cargo_type_flags into a separately allocated object.
Change savegame format, add a new chunk for cargo_type_flags.
2016-09-05 00:12:48 +01:00
Jonathan G Rennison
c1c983ea16 Import cargo type orders patch
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
2016-09-04 23:00:10 +01:00
alberth
f286ba8db2 (svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit. 2016-09-04 16:06:50 +00:00
alberth
0b8869930f (svn r27652) -Fix(r27650): Use the file operation being performed to set the _sl.action variable. 2016-09-04 15:10:41 +00:00
alberth
e735bbebce (svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload. 2016-09-04 12:58:04 +00:00
alberth
a959c0c965 (svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType. 2016-09-04 12:57:43 +00:00
alberth
c3bed437ee (svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it. 2016-09-04 12:57:20 +00:00
alberth
b6c29ae4eb (svn r27639) -Codechange: Also always set the abstract FileToSaveLoad::filetype when setting a mode. 2016-09-04 12:47:39 +00:00
alberth
e78627f2f1 (svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function. 2016-09-04 12:47:07 +00:00
alberth
b5eb50da7b (svn r27637) -Codechange: Don't use _saveload_mode for scenario loading detection. 2016-09-04 12:46:29 +00:00
alberth
757bc0a97b (svn r27636) -Codechange: Rename FileType to AbstractFileType. 2016-09-04 12:46:07 +00:00
alberth
a35e970ab0 (svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions. 2016-09-04 12:45:40 +00:00
Jonathan G Rennison
e6c7134935 Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/saveload.cpp
2016-09-02 22:21:28 +01:00
Jonathan G Rennison
761463d134 Merge branch 'template_train_replacement-sx' into jgrpp
# Conflicts:
#	src/window.cpp
2016-08-26 00:19:11 +01:00
Jonathan G Rennison
1af23b7caa Merge branch 'template_train_replacement' into template_train_replacement-sx
# Conflicts:
#	src/saveload/saveload.cpp
2016-08-26 00:18:10 +01:00
Jonathan G Rennison
23a1c07378 Merge branch 'master' into template_train_replacement
Fix Template creation window vehicle drag cursor.
2016-08-26 00:00:20 +01:00
frosch
2337d169e8 (svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy. 2016-08-15 18:32:48 +00:00
Jonathan G Rennison
80e3af6bf5 Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
2016-06-30 20:25:22 +01:00
Jonathan G Rennison
71aa4c75cb Bump tracerestrict version due to weight/power/TE conditionals. 2016-06-30 20:17:45 +01:00
Jonathan G Rennison
74ff8b9e8e Merge branch 'crashlog_improvements' into jgrpp
# Conflicts:
#	Makefile.src.in
2016-06-12 21:21:55 +01:00
Jonathan G Rennison
abbc960e96 Linux crashlog: Use sigaction to get more info on fatal signals. 2016-06-10 23:39:26 +01:00
Jonathan G Rennison
5b7eb46fe4 Merge branch 'improved_breakdowns-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
2016-06-05 23:21:55 +01:00
Jonathan G Rennison
0d20a54606 Fix broken-down aircraft stuck at 0 speed on load.
Bump improved breakdowns version.
2016-06-05 23:20:25 +01:00
Jonathan G Rennison
09291a3b74 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
2016-05-23 18:41:00 +01:00
frosch
2de4652d09 (svn r27572) -Fix [FS#6442]: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames. 2016-05-22 10:10:17 +00:00
Jonathan G Rennison
d8a083b666 Allow timetable start dates to be set with full precision.
This avoids rounding of start dates when using minutes and
day length > 1.
2016-05-11 21:31:31 +01:00