diff --git a/client/src/panels/unitcontrolpanel.ts b/client/src/panels/unitcontrolpanel.ts index 2a440fd5..c5b4de9a 100644 --- a/client/src/panels/unitcontrolpanel.ts +++ b/client/src/panels/unitcontrolpanel.ts @@ -9,6 +9,7 @@ import { ROEDescriptions, ROEs, altitudeIncrements, emissionsCountermeasures, em import { ftToM, knotsToMs, mToFt, msToKnots } from "../other/utils"; import { GeneralSettings, Radio, TACAN } from "../interfaces"; import { ContextActionSet } from "../unit/contextactionset"; +import { Popup } from "../popups/popup"; export class UnitControlPanel extends Panel { #altitudeSlider: Slider; @@ -97,6 +98,8 @@ export class UnitControlPanel extends Panel { /* Follow roads switch */ this.#followRoadsSwitch = new Switch("follow-roads-switch", (value: boolean) => { getApp().getUnitsManager().setFollowRoads(value); + if (value) + (getApp().getPopupsManager().get("infoPopup") as Popup).setText("Warning: follow roads movements can cause lag"); }); /* Operate as */ diff --git a/client/views/panels/unitcontrol.ejs b/client/views/panels/unitcontrol.ejs index d8cb6147..52b96555 100644 --- a/client/views/panels/unitcontrol.ejs +++ b/client/views/panels/unitcontrol.ejs @@ -100,7 +100,7 @@
-

Follow roads

+

Follow roads

diff --git a/scripts/OlympusCommand.lua b/scripts/OlympusCommand.lua index f68c67e6..93c232f2 100644 --- a/scripts/OlympusCommand.lua +++ b/scripts/OlympusCommand.lua @@ -40,12 +40,14 @@ local lfs = require('lfs') -- Print a debug message if the debug option is true function Olympus.debug(message, displayFor) if debug == true then + Olympus.log:info(message) trigger.action.outText(message, displayFor) end end -- Print a notify message function Olympus.notify(message, displayFor) + Olympus.log:info(message) trigger.action.outText(message, displayFor) end diff --git a/src/core/include/scriptloader.h b/src/core/include/scriptloader.h index e1f01dd1..c498d950 100644 --- a/src/core/include/scriptloader.h +++ b/src/core/include/scriptloader.h @@ -5,7 +5,11 @@ function Olympus.protectedCall(...)\n\n \ local status, retval = pcall(...)\n \ if not status then\n \ - trigger.action.outText(\"ERROR: \" ..retval, 20)\n \ + if Olympus.log ~= nil then\n \ + Olympus.log:error(retval)\n \ + else\n \ + trigger.action.outText(\"Olympus critical error: \" ..retval, 20)\n \ + end\n \ end\n \ end\n \ trigger.action.outText(\"Olympus.protectedCall registered successfully\", 10)\n" diff --git a/src/utils/src/utils.cpp b/src/utils/src/utils.cpp index f6b0a556..7d8f6501 100644 --- a/src/utils/src/utils.cpp +++ b/src/utils/src/utils.cpp @@ -44,6 +44,7 @@ std::string to_string(const std::wstring& wstr) std::string random_string(size_t length) { + srand(time(NULL)); auto randchar = []() -> char { const char charset[] =