weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
This commit is contained in:
Applevangelist
2022-11-27 17:36:38 +01:00
parent 136d4109f5 eb5a72fc27
commit 8faf911df8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Utilities/Utils.lua
View File

@@ -1577,7 +1577,7 @@ function UTILS.GMTToLocalTimeDifference()
elseif theatre==DCSMAP.MarianaIslands then
return 10 -- Guam is UTC+10 hours.
elseif theatre==DCSMAP.Falklands then
return -3 -- Guam is UTC+10 hours.
return -3 -- Fireland is UTC-3 hours.
else
BASE:E(string.format("ERROR: Unknown Map %s in UTILS.GMTToLocal function. Returning 0", tostring(theatre)))
return 0