diff --git a/Moose Development/Moose/Globals.lua b/Moose Development/Moose/Globals.lua index f63f57e84..d1040822f 100644 --- a/Moose Development/Moose/Globals.lua +++ b/Moose Development/Moose/Globals.lua @@ -44,3 +44,15 @@ end if __na then BASE:I("Check /Scripts/MissionScripting.lua and comment out the lines with sanitizeModule(''). Use at your own risk!)") end +BASE.ServerName="Unknown" +if lfs and loadfile then + local serverfile=lfs.writedir() .. 'Config/serverSettings.lua' + if UTILS.FileExists(serverfile) then + loadfile(serverfile)() + if cfg and cfg.name then + BASE.ServerName=cfg.name + end + end + BASE.ServerName=BASE.ServerName or "Unknown" + BASE:I("Server Name: "..tostring(BASE.ServerName)) +end diff --git a/Moose Development/Moose/Utilities/Socket.lua b/Moose Development/Moose/Utilities/Socket.lua index a5626600e..78d7c6e44 100644 --- a/Moose Development/Moose/Utilities/Socket.lua +++ b/Moose Development/Moose/Utilities/Socket.lua @@ -58,7 +58,7 @@ SOCKET.DataType={ --- SOCKET class version. -- @field #string version -SOCKET.version="0.1.0" +SOCKET.version="0.2.0" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list @@ -121,6 +121,10 @@ end -- @return #SOCKET self function SOCKET:SendTable(Table) + -- Add server name for DCS + Table.server_name=BASE.ServerName or "Unknown" + + -- Encode json table. local json= self.json:encode(Table) -- Debug info.