Skip to content

editor_main: Fix version warning #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 28, 2023
Merged

editor_main: Fix version warning #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d815b4c
Update dumpxml.lua
sacr1ficez Jan 22, 2023
3d43087
Merge branch 'multitheftauto:master' into editor-ver-fix
sacr1ficez Jan 25, 2023
021ddd4
Fetch version from editor meta.xml instead
sacr1ficez Jan 25, 2023
939b914
Move get/set ver. into separate method.
sacr1ficez Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion [editor]/editor_main/meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<meta>
<info author="erorr404,jbeta,Talidan" description="Map editor's main component" edf:definition="editor_main.edf" />

<min_mta_version server="1.3.0-9.04584" />
<min_mta_version server="1.5.8-9.20957" />

<!-- Script to shutdown the running gamemode and maps, because otherwise you get trouble -->
<script src="gamemodestopper.lua" type="server" />
Expand Down
40 changes: 39 additions & 1 deletion [editor]/editor_main/server/dumpxml.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,49 @@ function dumpNodes ( xmlNode, elementTable, elementChildren )
end
end

local function syncMapMinVersion(mapXml)
local metaFile = xmlLoadFile("meta.xml")

if not metaFile then
return false
end

local editorMinVer = xmlFindChild(metaFile, "min_mta_version", 0)

if editorMinVer then
local mapVersionNode = xmlFindChild(mapXml, "min_mta_version", 0) or xmlCreateChild(mapXml, "min_mta_version")

if mapVersionNode then
local clientMinVer = xmlNodeGetAttribute(editorMinVer, "client")
local serverMinVer = xmlNodeGetAttribute(editorMinVer, "server")

if clientMinVer then
xmlNodeSetAttribute(mapVersionNode, "client", clientMinVer)
end

if serverMinVer then
xmlNodeSetAttribute(mapVersionNode, "server", serverMinVer)
end
end
end

xmlUnloadFile(metaFile)

return true
end

function dumpMeta ( xml, extraNodes, resource, filename, test )
if not resource then return false end
if not resource then
return false
end

dimension = dimension or 0
extraNodes = extraNodes or {}

-- Fetch min_mta_version from editor_main meta.xml

syncMapMinVersion(xml)

--Add OOP support
--[[local oopNode = xmlCreateChild(xml, "oop")
xmlNodeSetValue(oopNode, "true")]]
Expand Down