weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-18 21:25:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into branch

Browse Source 
# Conflicts:
#	Moose Development/Moose/Core/MarkerOps_Base.lua
This commit is contained in:
Applevangelist
2025-12-21 11:45:06 +01:00
parent 3aa3942998 af891f3fc2
commit 38fcb274a0
4 changed files with 197 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Core/Database.lua
+1 -1
View File
@@ -1820,7 +1820,7 @@ function DATABASE:_EventOnPlayerEnterUnit( Event )
if Event.IniDCSUnit then
-- Player entering a CA slot
if Event.IniObjectCategory == 1 and Event.IniGroup and Event.IniGroup:IsGround() then
if Event.IniObjectCategory == 1 and Event.IniUnit and Event.IniUnit:IsGround() then
local IsPlayer = Event.IniDCSUnit:getPlayerName()
if IsPlayer then
Moose Development/Moose/Core/MarkerOps_Base.lua
+2 -2
View File
@@ -202,9 +202,9 @@ end
-- @return #boolean
function MARKEROPS_BASE:_MatchTag(Eventtext)
local matches = false
self:I(self.lid .. "Casesensitive "..tostring(self.Casesensitive))
--self:I(self.lid .. "Casesensitive "..tostring(self.Casesensitive))
if self.Casesensitive == false then
self:I(self.lid .. "Marker non-casesensitive "..Eventtext)
--self:I(self.lid .. "Marker non-casesensitive "..Eventtext)
local type = string.lower(self.Tag) -- #string
if string.find(string.lower(Eventtext),type,1,true) then
matches = true --event text contains tag