dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,265 Commits 1 Branch 0 Tags
09ca051ff86a46bb711a54550980676bc18bfdbe
Commit Graph

1053 Commits

Author SHA1 Message Date
Jonathan G Rennison
dcbde21f18 Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/train_cmd.cpp
 2017-01-02 18:13:45 +00:00
Jonathan G Rennison
074555e41d Merge branch 'save_ext' into signal_tunnels_bridges 2016-12-28 15:06:08 +00:00
Jonathan G Rennison
5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp 
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
 2016-12-26 15:38:56 +00:00
Jonathan G Rennison
0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/clear_cmd.cpp
 2016-12-26 15:35:01 +00:00
Jonathan G Rennison
56f173e15e Merge branch 'master' into save_ext 2016-12-26 15:26:08 +00:00
frosch
d8a316d7c5 (svn r27709) -Fix-ish: Silence some warnings. (adf88) 2016-12-25 13:26:15 +00:00
Jonathan G Rennison
e1a841aa05 Fix loading of signals on bridges/tunnels from SpringPP savegames. 
Reg/green states were incorrect.
 2016-11-25 23:42:26 +00:00
Jonathan G Rennison
ddae95addb Rescale town cargo adj setting by 10x, for finer adjustment. 
Use DECIMAL1 instead of an integer.
 2016-11-25 23:24:41 +00:00
Jonathan G Rennison
37a58fd11d Add setting to increase station catchment radius. 
Update acceptance and refresh screen when catchment settings change.
 2016-11-20 01:49:10 +00:00
Jonathan G Rennison
dbd99707b6 Merge branch 'master' into save_ext 2016-11-11 18:27:24 +00:00
Jonathan G Rennison
7f10d83a4a Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-11-01 23:00:48 +00:00
Jonathan G Rennison
92254acf8d TBTR: Savegame and API changes to support multiple sprites per vehicle. 2016-11-01 20:27:30 +00:00
Jonathan G Rennison
d204062300 Merge branch 'master' into template_train_replacement 2016-11-01 19:43:35 +00:00
frosch
3f75b8bca2 (svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR) 2016-10-30 17:29:33 +00:00
frosch
ba566e9126 (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 2016-10-16 14:59:44 +00:00
frosch
f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
Jonathan G Rennison
55e98d1182 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2016-10-11 19:02:03 +01:00
Jonathan G Rennison
4c74bda0af Fix extended order info not being saved for vehicle current order. 
This fixes desync and related issues when loading savegames where
extended order info is used.
 2016-10-11 19:01:16 +01:00
Jonathan G Rennison
1778fda01e Merge branch 'day_length' into jgrpp 2016-10-11 00:45:01 +01:00
Jonathan G Rennison
6288a67fe1 Fix savegame load check overwriting date tick skip counter. 2016-10-11 00:43:52 +01:00
Jonathan G Rennison
8e6569c11f Include tick skip counter in all desync debug output. 
Change message format to make field identification easier.
Update desync message reader to support tick skip counter.
 2016-10-10 19:02:05 +01:00
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
c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
 2016-09-10 00:57:05 +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
Jonathan G Rennison
c8942219bd Merge branch 'save_ext' into day_length 
# Conflicts:
#	src/saveload/saveload.cpp
 2016-09-07 21:49:28 +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
162e495cc9 Merge branch 'save_ext' into tracerestrict-sx 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/extended_ver_sl.cpp
 2016-09-05 23:33:33 +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