dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,151 Commits 1 Branch 0 Tags
a311f12615e2176ee8d7d51419fd54baf6e1042c
Commit Graph

119 Commits

Author SHA1 Message Date
Jonathan G Rennison
83a063f51c Add train is in slot conditional order 2018-11-05 04:21:08 +00:00
Jonathan G Rennison
3e50336079 Add trace restrict train status conditional 2018-08-21 19:22:35 +01:00
Jonathan G Rennison
f59535c0b7 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/train_cmd.cpp
 2018-08-16 05:45:30 +01:00
keldorkatarn
acdeaa715e Tracerestrict slots: Fix a crash bug when selling a train that's in a tracerestrict slot. Again a use of an invalid iterator. We need to check FIRST if range.first and reange.second are equal. After erasing the range those iterators are invalid. 
(cherry picked from commit 7aea2ced3ced5ec4201fbad9c206451aad057718)
 2018-08-15 19:22:18 +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
e9f5d80440 Trace restrict slots: Add support for slot operations at PBS end signal 2018-06-17 21:13:53 +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
751f379cdd Trace restrict: Fix wrong position of safeguards header include 2018-06-17 18:54:16 +01:00
Jonathan G Rennison
de4d958808 Fix tracerestrict current order test on load through advance order 2018-04-24 21:30:00 +01:00
Jonathan G Rennison
97fd250d21 Remove conditional order refs when removing tracerestrict slot 
See #40
 2018-04-22 15:03:16 +01:00
keldorkatarn
78588d8ce5 First implementation of conditional order checking slot occupancy 
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)

Some code adjustments: serialisation/storage, formatting

See: #40
 2018-04-22 15:03:16 +01:00
Jonathan G Rennison
02328680a1 Merge branch 'tracerestrict-sx' into jgrpp 2018-04-17 16:35:38 +01:00
keldorkatarn
2f3e4044b7 FIX: TraceRestrictSlots: Fix crash when removing vehicle from slot. Invalid iterator got used. (it was no longer valid after calling erase with it) 
(cherry picked from commit 3571f1bc898b9ffd8b124040882caa5357085f42)

Fixes: #37
 2018-04-17 16:34:03 +01:00
Jonathan G Rennison
64d9cdd6f0 Merge branch 'tracerestrict-sx' into jgrpp 2017-06-20 19:19:39 +01:00
Jonathan G Rennison
b004c1998f Merge branch 'tracerestrict' into tracerestrict-sx 2017-06-20 19:19:21 +01:00
Jonathan G Rennison
7986367c1f Tracerestrict: Add program append management action. 2017-06-20 19:18:39 +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
c44141bad6 Add conditional to test slot occupancy state. 
Bump tracerestrict version.
 2017-04-10 19:00:52 +01:00
Jonathan G Rennison
c94b7a6240 Add safeguard includes to tracerestrict files. 2017-04-10 18:57:46 +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
0772236986 Add a release slot at front of train slot action. 
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
 2017-03-31 01:10:26 +01:00
Jonathan G Rennison
927323dcb1 Add trace restrict slot membership conditional. 2017-03-30 21:53:30 +01:00
Jonathan G Rennison
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
Jonathan G Rennison
5a2d482c28 Tracerestrict: Add wait at PBS signal action. 2017-03-27 23:30:15 +01:00
Jonathan G Rennison
8cf0f354d9 Merge branch 'tracerestrict-sx' into jgrpp 2017-02-27 18:51:37 +00:00
Jonathan G Rennison
13f8de58c3 Add instruction move up/down buttons to GUI. 
Has block and individual instruction move modes, depending on ctrl.
 2017-02-26 23:52:15 +00:00
Jonathan G Rennison
f10c32de53 Fix removal of double-length conditional instructions (PBS entry signal). 2017-02-26 22:51:18 +00:00
Jonathan G Rennison
f192865c27 Allow shallow-removing conditional blocks by use of ctrl+click. 2017-02-26 21:39:04 +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
f942de699c Add power/weight and max TE/weight ratio tracerestrict conditionals. 
Minor refactorings.
 2016-06-30 19:31:45 +01:00
Jonathan G Rennison
91ba866852 Fix comment typo. 2016-06-30 18:55:26 +01:00
Jonathan G Rennison
b5531975da Add train weight, power, and max TE tracerestrict conditionals. 
Minor refactorings.
 2016-06-29 22:08:05 +01:00
Jonathan G Rennison
0d26da998b Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-04-05 20:12:09 +01:00
Jonathan G Rennison
213b0e7e3a Tracerestrict: Add a group membership conditional. 2016-04-05 18:40:16 +01:00
Jonathan G Rennison
49988b37b8 Merge branches 'tracerestrict-sx' and 'template_train_replacement-sx' into jgrpp 2016-03-08 19:33:00 +00:00
Jonathan G Rennison
4d94470d08 Update all tracerestrict windows when a restricted signal is removed. 
This fixes share counts in any open windows sharing the same program
not being updated.
 2016-03-08 19:20:55 +00:00
Jonathan G Rennison
8dc76b0044 Be more strict checking for space in program pool in mgmt actions. 2016-03-03 19:14:10 +00:00
Jonathan G Rennison
5d42d07988 Merge branch 'tracerestrict-sx' into jgrpp 2016-03-01 20:55:19 +00:00
Jonathan G Rennison
83369d5e71 Remove unused constant _tracerestrict_penalty_item_default_value. 2016-02-05 18:52:24 +00:00
Jonathan G Rennison
73e8c32a5d Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/tracerestrict.h
	src/tracerestrict_gui.cpp
	src/train_cmd.cpp
 2016-01-20 22:19:15 +00:00
patch-import
82cab7f31c Tracerestrict: Import "Long Reserve" feature. 
https://github.com/KeldorKatarn/OpenTTD_PatchPack

Minor code de-duplications.
 2016-01-20 21:49:53 +00:00
Jonathan G Rennison
0c29f9f9a0 Merge branch 'tracerestrict-sx' into jgrpp 2016-01-15 19:06:23 +00:00
Jonathan G Rennison
d2e8d205b9 Tracerestrict: Fix copying an unrestricted signal making an empty program. 2016-01-14 19:09:34 +00:00
Jonathan G Rennison
c3948ef5e9 Merge branch 'tracerestrict-sx' into jgrpp 2016-01-04 18:40:26 +00:00
Jonathan G Rennison
20a015e9d3 Fix actions_used_flags not being set when cloning tracerestrict programs. 
This resulted in newly copied or unshared programs not being evaluated.
 2016-01-04 18:40:06 +00:00
Jonathan G Rennison
7673436d3a Trace restrict: add train ownership conditional. 
Infra sharing whitespace fix.
 2015-12-15 20:30:20 +00:00
Jonathan G Rennison
95c532b134 Merge branch 'tracerestrict-sx' into jgrpp 2015-12-15 18:43:11 +00:00
Jonathan G Rennison
9c5189b212 Handle double instructions correctly when deleting stations/depots/etc. 
Fix some whitespace and comment typos.
 2015-12-15 18:36:02 +00:00
Jonathan G Rennison
3dec3242cc Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-02 21:09:25 +01:00
Jonathan G Rennison
73b69c5594 Validate type of all instructions, log validation failures at load. 
The validator now checks that the type of conditional instructions
is known.
On a validation failure, the load code now outputs a corrupt savegame
message, with the validation error message and a program dump,
instead of using an assertion.
 2015-09-02 20:51:30 +01:00