f59535c0b7
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
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)
6 years ago
2586096ef6
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
e9f5d80440
Trace restrict slots: Add support for slot operations at PBS end signal
6 years ago
1b4db7d86c
Trace restrict: Add wait at entrance PBS for reservation ending here
6 years ago
751f379cdd
Trace restrict: Fix wrong position of safeguards header include
6 years ago
de4d958808
Fix tracerestrict current order test on load through advance order
6 years ago
97fd250d21
Remove conditional order refs when removing tracerestrict slot
...
See #40
6 years ago
78588d8ce5
First implementation of conditional order checking slot occupancy
...
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)
Some code adjustments: serialisation/storage, formatting
See: #40
6 years ago
02328680a1
Merge branch 'tracerestrict-sx' into jgrpp
6 years ago
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
6 years ago
64d9cdd6f0
Merge branch 'tracerestrict-sx' into jgrpp
7 years ago
b004c1998f
Merge branch 'tracerestrict' into tracerestrict-sx
7 years ago
7986367c1f
Tracerestrict: Add program append management action.
7 years ago
bfb8f6f32e
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
7 years ago
c44141bad6
Add conditional to test slot occupancy state.
...
Bump tracerestrict version.
7 years ago
c94b7a6240
Add safeguard includes to tracerestrict files.
7 years ago
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
7 years ago
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.
7 years ago
927323dcb1
Add trace restrict slot membership conditional.
7 years ago
6417fb16c3
Initial implementation of trace restrict slots
7 years ago
5a2d482c28
Tracerestrict: Add wait at PBS signal action.
7 years ago
8cf0f354d9
Merge branch 'tracerestrict-sx' into jgrpp
7 years ago
13f8de58c3
Add instruction move up/down buttons to GUI.
...
Has block and individual instruction move modes, depending on ctrl.
7 years ago
f10c32de53
Fix removal of double-length conditional instructions (PBS entry signal).
7 years ago
f192865c27
Allow shallow-removing conditional blocks by use of ctrl+click.
7 years ago
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
8 years ago
f942de699c
Add power/weight and max TE/weight ratio tracerestrict conditionals.
...
Minor refactorings.
8 years ago
91ba866852
Fix comment typo.
8 years ago
b5531975da
Add train weight, power, and max TE tracerestrict conditionals.
...
Minor refactorings.
8 years ago
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
8 years ago
213b0e7e3a
Tracerestrict: Add a group membership conditional.
8 years ago
49988b37b8
Merge branches 'tracerestrict-sx' and 'template_train_replacement-sx' into jgrpp
8 years ago
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.
8 years ago
8dc76b0044
Be more strict checking for space in program pool in mgmt actions.
8 years ago
5d42d07988
Merge branch 'tracerestrict-sx' into jgrpp
8 years ago
83369d5e71
Remove unused constant _tracerestrict_penalty_item_default_value.
8 years ago
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
9 years ago
82cab7f31c
Tracerestrict: Import "Long Reserve" feature.
...
https://github.com/KeldorKatarn/OpenTTD_PatchPack
Minor code de-duplications.
9 years ago
0c29f9f9a0
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
d2e8d205b9
Tracerestrict: Fix copying an unrestricted signal making an empty program.
9 years ago
c3948ef5e9
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
20a015e9d3
Fix actions_used_flags not being set when cloning tracerestrict programs.
...
This resulted in newly copied or unshared programs not being evaluated.
9 years ago
7673436d3a
Trace restrict: add train ownership conditional.
...
Infra sharing whitespace fix.
9 years ago
95c532b134
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
9c5189b212
Handle double instructions correctly when deleting stations/depots/etc.
...
Fix some whitespace and comment typos.
9 years ago
3dec3242cc
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
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.
9 years ago
d9acfc4599
Fix validation of dual item instructions.
9 years ago
e2435c7169
Only run trace restrict programs if they contain relevant actions.
...
Only run in pathfinder case if deny or penalty are present.
Only run in is safe waiting tile case is reserve through is present.
Presence is determined at program validation time and cached in the
program structure.
Validator now checks for unknown non-conditional instructions.
9 years ago
Jonathan G Rennison
keldorkatarn
patch-import