dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,076 Commits 1 Branch 0 Tags
f8d6e781bae9d64c5cc76451abc88feca7697e7b
Commit Graph

2108 Commits

Author SHA1 Message Date
Jonathan G Rennison
ae15c96c1a Merge branch 'master' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 2018-07-26 20:54:13 +01:00
Jonathan G Rennison
9490f33a6c Merge branch 'master' into crashlog_improvements 
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
 2018-07-26 20:01:08 +01:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
Peter Nelson
bf8d7df736 Change: Extend rail types to 64 (6 bit storage) 2018-07-26 13:27:40 +01:00
Peter Nelson
5db883fbe9 Change: Move rail type bits from m3 to m8. 2018-07-26 13:27:40 +01:00
Peter Nelson
65548c37a8 Change: Extend map array by 2 bytes with a uint16. 2018-07-26 13:27:40 +01:00
Jonathan G Rennison
3ed5d8f09f Add mechanism to lock wait times in timetable against autofill/automate changes 2018-07-19 00:32:24 +01:00
Jonathan G Rennison
6740a9a470 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp
 2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a Initial support for rail custom bridge heads 2018-07-08 23:03:42 +01:00
Jonathan G Rennison
2419974f19 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-07-05 01:13:52 +01:00
Jonathan G Rennison
bce0ce85b3 Fix comment on setting update for 0.1 increment town cargo scale factor 2018-07-04 18:35:28 +01:00
Jonathan G Rennison
3330e4cef8 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
 2018-07-02 21:04:06 +01:00
Jonathan G Rennison
00b1fe6246 Cargo type orders: Add support for 64 cargo types 2018-07-02 21:03:53 +01:00
Jonathan G Rennison
0ae32838ea Merge branch 'save_ext' into cargo_type_order 
# Conflicts:
#	src/core/smallstack_type.hpp
 2018-07-02 18:52:22 +01:00
Jonathan G Rennison
373ff3dd4e Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/table/settings.h.preamble
 2018-07-02 18:41:39 +01:00
Jonathan G Rennison
5770f1407a Signals on bridges: Shrink M2 simulated signal states field 2018-07-02 18:29:10 +01:00
Charles Pigott
2aacddd412 Codechange: lengthof is not defined for runtime-length strings, use sizeof instead 2018-06-27 22:54:46 +02:00
Charles Pigott
5f86e1a390 Codechange: Silence -Wclass-memaccess warnings with GCC8 2018-06-27 22:54:46 +02:00
PeterN
11ab3c4ea2 Change: Increase cargo type limit to 64. 2018-06-26 13:32:58 +01:00
Jonathan G Rennison
ef0a458ab6 Add go to depot and sell vehicle orders 
Controlled by a setting (default off)
 2018-06-21 23:28:19 +01:00
Jonathan G Rennison
fd08259698 Fix fast path being unconditionally disabled in save/load whole map 2018-06-21 18:29:39 +01:00
Jonathan G Rennison
2586096ef6 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-06-17 23:24:22 +01:00
Jonathan G Rennison
1b4db7d86c Trace restrict: Add wait at entrance PBS for reservation ending here 2018-06-17 18:55:33 +01:00
Jonathan G Rennison
e82ccad052 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/table/settings.ini
#	src/train_cmd.cpp
#	src/tunnelbridge.h
 2018-06-17 09:35:18 +01:00
Jonathan G Rennison
d03139b241 Use separate bits for signals on bridge/tunnel entrance/exit red/green states 2018-06-17 04:01:31 +01:00
Jonathan G Rennison
2c7b96cf1e Merge branch 'save_ext' into jgrpp 2018-06-11 00:58:52 +01:00
Jonathan G Rennison
a3156804c5 Fix narrowing/type conversion warning on big endian platforms 2018-06-11 00:55:49 +01:00
Jonathan G Rennison
c5954fd1bd Fix syntax errors in saveload_buffer.h on strict pointer alignment platforms 
Fixes #57
 2018-06-11 00:54:29 +01:00
Jonathan G Rennison
fd4d9591c1 Merge branch 'save_ext' into jgrpp 2018-06-06 01:56:07 +01:00
Jonathan G Rennison
616cbf580a Use unaligned typedefs in unaligned save/load accessors 2018-06-06 01:55:51 +01:00
Jonathan G Rennison
40c7ccd6e6 Merge branch 'enhanced_viewport_overlay' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2018-06-02 00:11:23 +01:00
Jonathan G Rennison
9376dc7089 Change viewport plan save format 
The previous format stored sparse keys in a non-sparse array chunk,
which resulted in a significant savegame size penalty.
 2018-06-02 00:10:36 +01:00
Jonathan G Rennison
03b0931c57 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/saveload.cpp
 2018-06-01 23:32:33 +01:00
Jonathan G Rennison
51e9cc6695 Log save/load chunk sizes at sl debug level 3 2018-06-01 23:24:30 +01:00
cirdan
c06c929771 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)
(cherry picked from commit 4a19babf9e)
 2018-06-01 23:23:57 +01:00
cirdan
4134b81af0 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)
(cherry picked from commit ec157b4a66)
 2018-06-01 23:23:10 +01:00
Jonathan G Rennison
4007338280 Clear VF_CARGO_UNLOADING flag from vehicles with no cargo_payment 
Bump train_through_load savegame version
 2018-06-01 20:05:53 +01:00
Jonathan G Rennison
777151c34d Station rating: Track last visited vehicle type separately per-cargo 2018-06-01 19:12:53 +01:00
Jonathan G Rennison
e6e93d40e8 Station flow stat save/load performance improvement 
Avoid use of SlObject in inner loop
 2018-05-29 00:53:25 +01:00
Jonathan G Rennison
6187517429 Add whole-map savegame chunk 
This is to avoid haveing to do many passes to save/load map
 2018-05-29 00:24:27 +01:00
Jonathan G Rennison
159909f4b1 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/saveload/saveload.cpp
 2018-05-29 12:23:56 +01:00
Jonathan G Rennison
aae7806d5d Move save/load ReadBuffer and MemoryDumper to separate header 
Add static accessors
 2018-05-29 00:21:39 +01:00
Jonathan G Rennison
bbec436a74 Change SlAutolength to only call proc once 2018-05-29 00:16:53 +01:00
innocenat
7c4bd7d3a3 Add variable std::vector save type 
SL_VEC in the game currenty only support SlRefType, not VarType. This add another save type, SL_VARVEC, to support saving std::vector with POD type. It supports all integer type.
(cherry picked from commit 2895b1921d)

Fix bug in new SL_VARVEC save/load code

(cherry picked from commit 59554a5dd2)
 2018-05-29 00:16:53 +01:00
Jonathan G Rennison
c71ed22e7a Save/memory dumper performance improvements 2018-05-29 00:16:53 +01:00
Jonathan G Rennison
3b83a9e186 Performance improvements to savegame loading 2018-05-29 00:16:53 +01:00
Jonathan G Rennison
cecbf257bc Merge branch 'save_ext' into template_train_replacement 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/vehicle_gui.cpp
 2018-05-25 19:12:10 +01:00
Jonathan G Rennison
fa304cdb75 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
 2018-05-25 19:09:20 +01:00
Jonathan G Rennison
56be293107 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
 2018-05-25 18:29:17 +01:00
PeterN
a07394a63a Change: Remove direction parameter from Vehicle::UpdateDeltaXY. (#6792) 
The value is either unused or always the same as this->direction.
 2018-05-22 18:43:34 +01:00