diff --git a/BUK-M2/Nasal/damage.nas b/BUK-M2/Nasal/damage.nas index b15285e..57682d9 100644 --- a/BUK-M2/Nasal/damage.nas +++ b/BUK-M2/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/BUK-M2/Nasal/guided-missiles.nas b/BUK-M2/Nasal/guided-missiles.nas index 5d70880..c8a1498 100644 --- a/BUK-M2/Nasal/guided-missiles.nas +++ b/BUK-M2/Nasal/guided-missiles.nas @@ -159,7 +159,7 @@ var major = num(version[0]); var minor = num(version[1]); var pica = num(version[2]); -var sep_thread = getprop("payload/threading") != nil or !(major == 2020 and minor == 4);#Bug in 2020.4.0 threadsafe properties makes this needed. +var sep_thread = getprop("payload/threading") != nil or !((major == 2020 and minor == 4) or (major > 2020));#Bug in 2024.4 threadsafe properties makes this needed. var wingedGuideFactor = 0.1; diff --git a/Frigate/Nasal/damage.nas b/Frigate/Nasal/damage.nas index b15285e..57682d9 100644 --- a/Frigate/Nasal/damage.nas +++ b/Frigate/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/MIM-104D/Nasal/damage.nas b/MIM-104D/Nasal/damage.nas index b15285e..57682d9 100644 --- a/MIM-104D/Nasal/damage.nas +++ b/MIM-104D/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/MIM-104D/Nasal/guided-missiles.nas b/MIM-104D/Nasal/guided-missiles.nas index 5d70880..c8a1498 100644 --- a/MIM-104D/Nasal/guided-missiles.nas +++ b/MIM-104D/Nasal/guided-missiles.nas @@ -159,7 +159,7 @@ var major = num(version[0]); var minor = num(version[1]); var pica = num(version[2]); -var sep_thread = getprop("payload/threading") != nil or !(major == 2020 and minor == 4);#Bug in 2020.4.0 threadsafe properties makes this needed. +var sep_thread = getprop("payload/threading") != nil or !((major == 2020 and minor == 4) or (major > 2020));#Bug in 2024.4 threadsafe properties makes this needed. var wingedGuideFactor = 0.1; diff --git a/S-200/Nasal/damage.nas b/S-200/Nasal/damage.nas index b15285e..57682d9 100644 --- a/S-200/Nasal/damage.nas +++ b/S-200/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/S-300/Nasal/damage.nas b/S-300/Nasal/damage.nas index b15285e..57682d9 100644 --- a/S-300/Nasal/damage.nas +++ b/S-300/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/S-75/Nasal/damage.nas b/S-75/Nasal/damage.nas index b15285e..57682d9 100644 --- a/S-75/Nasal/damage.nas +++ b/S-75/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/S-75/Nasal/guided-missiles.nas b/S-75/Nasal/guided-missiles.nas index 5d70880..c8a1498 100644 --- a/S-75/Nasal/guided-missiles.nas +++ b/S-75/Nasal/guided-missiles.nas @@ -159,7 +159,7 @@ var major = num(version[0]); var minor = num(version[1]); var pica = num(version[2]); -var sep_thread = getprop("payload/threading") != nil or !(major == 2020 and minor == 4);#Bug in 2020.4.0 threadsafe properties makes this needed. +var sep_thread = getprop("payload/threading") != nil or !((major == 2020 and minor == 4) or (major > 2020));#Bug in 2024.4 threadsafe properties makes this needed. var wingedGuideFactor = 0.1; diff --git a/SA-3/Nasal/damage.nas b/SA-3/Nasal/damage.nas index b15285e..57682d9 100644 --- a/SA-3/Nasal/damage.nas +++ b/SA-3/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/SA-3/Nasal/guided-missiles.nas b/SA-3/Nasal/guided-missiles.nas index 5d70880..c8a1498 100644 --- a/SA-3/Nasal/guided-missiles.nas +++ b/SA-3/Nasal/guided-missiles.nas @@ -159,7 +159,7 @@ var major = num(version[0]); var minor = num(version[1]); var pica = num(version[2]); -var sep_thread = getprop("payload/threading") != nil or !(major == 2020 and minor == 4);#Bug in 2020.4.0 threadsafe properties makes this needed. +var sep_thread = getprop("payload/threading") != nil or !((major == 2020 and minor == 4) or (major > 2020));#Bug in 2024.4 threadsafe properties makes this needed. var wingedGuideFactor = 0.1; diff --git a/SA-6/Nasal/damage.nas b/SA-6/Nasal/damage.nas index b15285e..57682d9 100644 --- a/SA-6/Nasal/damage.nas +++ b/SA-6/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/SA-6/Nasal/guided-missiles.nas b/SA-6/Nasal/guided-missiles.nas index 5d70880..c8a1498 100644 --- a/SA-6/Nasal/guided-missiles.nas +++ b/SA-6/Nasal/guided-missiles.nas @@ -159,7 +159,7 @@ var major = num(version[0]); var minor = num(version[1]); var pica = num(version[2]); -var sep_thread = getprop("payload/threading") != nil or !(major == 2020 and minor == 4);#Bug in 2020.4.0 threadsafe properties makes this needed. +var sep_thread = getprop("payload/threading") != nil or !((major == 2020 and minor == 4) or (major > 2020));#Bug in 2024.4 threadsafe properties makes this needed. var wingedGuideFactor = 0.1; diff --git a/ZSU-23/Nasal/damage.nas b/ZSU-23/Nasal/damage.nas index b15285e..57682d9 100644 --- a/ZSU-23/Nasal/damage.nas +++ b/ZSU-23/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/depot/Nasal/damage.nas b/depot/Nasal/damage.nas index b15285e..57682d9 100644 --- a/depot/Nasal/damage.nas +++ b/depot/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/fleet/Nasal/damage.nas b/fleet/Nasal/damage.nas index b15285e..57682d9 100644 --- a/fleet/Nasal/damage.nas +++ b/fleet/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/gci-radar/Nasal/damage.nas b/gci-radar/Nasal/damage.nas index b15285e..57682d9 100644 --- a/gci-radar/Nasal/damage.nas +++ b/gci-radar/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/groundtarget/Nasal/damage.nas b/groundtarget/Nasal/damage.nas index b15285e..57682d9 100644 --- a/groundtarget/Nasal/damage.nas +++ b/groundtarget/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/missile-frigate/Nasal/damage.nas b/missile-frigate/Nasal/damage.nas index b15285e..57682d9 100644 --- a/missile-frigate/Nasal/damage.nas +++ b/missile-frigate/Nasal/damage.nas @@ -1494,6 +1494,7 @@ var code_ct = func () { setprop("sim/freeze/fuel",0); if (!m28_auto) setprop("/sim/speed-up", 1); setprop("/gui/map/draw-traffic", 0); + setprop("/sim/gui/map/draw-traffic", 0); setprop("/sim/marker-pins/traffic", 0); setprop("/sim/gui/dialogs/map-canvas/draw-TFC", 0); #fgcommand("timeofday", props.Node.new({"timeofday": "real"})); diff --git a/oprf-versions.json b/oprf-versions.json index 6bb4714..9bf2ab0 100644 --- a/oprf-versions.json +++ b/oprf-versions.json @@ -59,81 +59,81 @@ ], "missile-code": [ { - "version": "1.1.7", + "version": "1.1.8", "path": "BUK-M2/Nasal/guided-missiles.nas" }, { - "version": "1.1.7", + "version": "1.1.8", "path": "MIM-104D/Nasal/guided-missiles.nas" }, { - "version": "1.1.7", + "version": "1.1.8", "path": "S-75/Nasal/guided-missiles.nas" }, { - "version": "1.1.7", + "version": "1.1.8", "path": "SA-3/Nasal/guided-missiles.nas" }, { - "version": "1.1.7", + "version": "1.1.8", "path": "SA-6/Nasal/guided-missiles.nas" } ], "damage": [ { - "version": "1.4.11", + "version": "1.4.12", "path": "BUK-M2/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "depot/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "fleet/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "Frigate/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "gci-radar/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "groundtarget/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "MIM-104D/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "missile-frigate/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "S-200/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "S-300/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "S-75/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "SA-3/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "SA-6/Nasal/damage.nas" }, { - "version": "1.4.11", + "version": "1.4.12", "path": "ZSU-23/Nasal/damage.nas" } ],