dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,307 Commits 1 Branch 0 Tags
e5b61e0b6cfe8c86d89d7313e281a0716d88fbb5
Commit Graph

1894 Commits

Author SHA1 Message Date
innocenat
59554a5dd2 Fix bug in new SL_VARVEC save/load code 2017-05-30 02:56:02 +07:00
innocenat
0b8f0e64ec Scheduled Dispatch feature 
Code is tested and run well on small-ish train network. Not tested extensively.
 2017-05-30 01:37:08 +07:00
innocenat
2895b1921d 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.
 2017-05-29 19:08:15 +07:00
Jonathan G Rennison
0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 2017-05-07 19:33:59 +01:00
Jonathan G Rennison
bfb8f6f32e Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2017-04-11 23:42:14 +01:00
Jonathan G Rennison
d1a287d73c Merge branch 'save_ext' into jgrpp 2017-04-11 18:42:11 +01:00
Jonathan G Rennison
cb9ffe1bd9 Move std::string str_validate to separate header 
This is to fix compilation of squirrel on MacOS/clang, as squirrel
defines macros which clash with including <string>
 2017-04-11 18:39:27 +01:00
Jonathan G Rennison
c44141bad6 Add conditional to test slot occupancy state. 
Bump tracerestrict version.
 2017-04-10 19:00:52 +01:00
Jonathan G Rennison
b8328ad21f Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2017-04-05 19:00:24 +01:00
Jonathan G Rennison
f50a9fef4f Add TRRS tracerestrict slot chunk to SLXI header. 2017-04-04 18:47:21 +01:00
Jonathan G Rennison
8317eac918 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
 2017-04-01 01:14:28 +01:00
Jonathan G Rennison
83091f55da Merge branch 'vehicle_group_info' into jgrpp 2017-04-01 01:02:22 +01:00
Jonathan G Rennison
9d0f0967f9 Enabled loading non-SLXI version 2002 tracerestrict savegames. 2017-03-30 22:52:14 +01:00
Jonathan G Rennison
19e5964b31 Bump tracerestrict version due to wait at PBS and slot features. 2017-03-30 22:49:27 +01:00
Jonathan G Rennison
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
Jonathan G Rennison
7194e19380 Merge branch 'save_ext' into tracerestrict-sx 2017-03-29 19:52:59 +01:00
Jonathan G Rennison
dd0666c5f4 Add support for save/loading std::strings. 2017-03-29 19:41:06 +01:00
Jonathan G Rennison
f58fe00294 Merge branch 'master' into save_ext 2017-03-28 02:26:13 +01:00
peter1138
0887289e3d (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
peter1138
19d56a33e8 (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
Jonathan G Rennison
58d8a791e4 Merge branch 'save_ext' into tracerestrict-sx 2017-03-20 19:18:34 +00:00
Jonathan G Rennison
b3fd11efd2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp
 2017-03-19 12:27:24 +00:00
Jonathan G Rennison
fae4ac1a5d Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
 2017-03-19 12:12: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
peter1138
ff26c6393e (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
Jonathan G Rennison
ac69b746ab Merge branch 'master' into jgrpp 
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
 2017-03-12 20:37: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
ca3aaf8f6d (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
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
frosch
24786a71ee (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
fonsinchen
0d5ee772fc (svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR) 2017-03-05 17:06:14 +00:00
fonsinchen
4e13285274 (svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR) 2017-03-05 17:06:14 +00:00
Jonathan G Rennison
0690dbb8bf Merge branch 'jgrpp' into chunnel 2017-03-05 15:30:27 +00:00
Jonathan G Rennison
fa044852d5 Merge branch 'day_length' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
 2017-03-05 15:29:45 +00:00
Jonathan G Rennison
1f148322fb Reset day length factor to 1 when loading pre day length savegame 2017-03-05 15:25:34 +00:00
Jonathan G Rennison
11906f24c5 Merge branch 'save_ext' into day_length 2017-03-05 15:05:13 +00:00
Jonathan G Rennison
89a0a9c182 Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format. 2017-03-05 14:39:10 +00:00
Jonathan G Rennison
ad15b47f72 Chunnel: Fix setting of tunnel ID in load conversion, add method to set ID. 2017-03-05 14:39:06 +00:00
Jonathan G Rennison
afd8c6b867 Chunnel: Increase tunnel pool size, make tunnel IDs 32 bit. 
Add lookup mechanism for tunnel IDs which don't fit in 16 bits in M2.
 2017-03-05 14:39:01 +00:00
Jonathan G Rennison
702404dc6a Fix issues with uncleared variables when loading old save games. 2017-03-04 20:28:07 +00:00
Jonathan G Rennison
79439925c8 Clear discardable chunk IDs in SlXvResetState. 2017-03-04 20:09:42 +00:00
Jonathan G Rennison
02b33e7f64 Chunnel: Add error text for too many tunnels. 2017-03-04 13:06:43 +00:00
Jonathan G Rennison
75410ddae4 Chunnel: Save/load changes 2017-03-04 12:39:32 +00:00
Jonathan G Rennison
aac5b2d4ad Chunnel: Adjust struct Tunnel constructor 2017-03-04 12:36:01 +00:00
Jonathan G Rennison
ee0d6e2fe6 Chunnel: Remove debug prints from afterload code. 2017-03-04 12:24:00 +00:00
Jonathan G Rennison
04244e7215 Chunnel: Fix typo in name of GetOtherTunnelBridgeEndOld 2017-03-04 12:23:56 +00:00
HackaLittleBit
f173b74e81 Chunnel patch 28398: Codechange: Save Tunnel Pool. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:53:48 +00:00
HackaLittleBit
67e7d12eb7 Chunnel patch 28393: Codechange: Rework GetOtherTunnelEnd proc. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:44:25 +00:00
Jonathan G Rennison
a6168dd2f0 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/saveload/company_sl.cpp
 2017-02-28 00:15:45 +00:00
frosch
60f7168c22 (svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default. 2017-02-26 20:31:02 +00:00