Merge branch 'master' into update-strucuture-mapserver

Author: Dutchman101

[admin]/admin/client/gui/admin_maps.lua

@@ -65,14 +65,15 @@ function guiClick(button)
 			if source == aTabMap.RefreshList then
 				guiGridListClear(aTabMap.MapList)
 				triggerServerEvent("getMaps_s", localPlayer, true)
+				return
 			end
-			if ( source ~= aTabMap.MapListSearch ) and guiGridListGetSelectedItem ( aTabMap.MapList ) == -1 then
+			local selectedRow = guiGridListGetSelectedItem( aTabMap.MapList )
+			local mapName = guiGridListGetItemText ( aTabMap.MapList, selectedRow, 1 )
+			local mapResName = guiGridListGetItemText ( aTabMap.MapList, selectedRow, 2 )
+			local gamemode = guiGridListGetItemText ( aTabMap.MapList, selectedRow, 3 )
+			if ( source == aTabMap.Start or source == aTabMap.NextMap ) and selectedRow == -1 then
 				aMessageBox ( "error", "No map selected!" )
-			end
-			local mapName = guiGridListGetItemText ( aTabMap.MapList, guiGridListGetSelectedItem( aTabMap.MapList ), 1 )
-			local mapResName = guiGridListGetItemText ( aTabMap.MapList, guiGridListGetSelectedItem( aTabMap.MapList ), 2 )
-			local gamemode = guiGridListGetItemText ( aTabMap.MapList, guiGridListGetSelectedItem( aTabMap.MapList ), 3 )
-			if source == aTabMap.MapList then
+			elseif source == aTabMap.MapList then
 				if gamemode == "race" then
 					guiSetEnabled(aTabMap.NextMap, true)
 				else

[editor]/editor_main/client/playerspawn.lua

@@ -0,0 +1,7 @@
+addEventHandler("onClientPlayerSpawn",localPlayer,
+    function()
+        if not getElementData(resourceRoot, "g_in_test") then
+            setElementInterior(localPlayer, getWorkingInterior())
+        end
+    end
+)

[editor]/editor_main/meta.xml

@@ -66,6 +66,7 @@
 	<!-- Player attachment and spawning -->
 	<script src="client/superman.lua" type="client" validate="false" />
 	<script src="client/attachplayer.lua" type="client" validate="false" />
+	<script src="client/playerspawn.lua" type="client" />
 	<script src="server/playerspawn.lua" type="server" />
 	<script src="server/playerblips.lua" type="server" />
 

[editor]/editor_main/server/playerspawn.lua

@@ -18,6 +18,16 @@ addEventHandler ( "onPlayerJoin", root,
 	end
 )
 
+addEventHandler ( "onPlayerWasted", root,
+	function()
+		if not g_in_test then
+			local x,y,z = getElementPosition(source)
+			local rx,ry,rz = getElementRotation(source)
+			spawnPlayer ( source, x, y, z, rz, 0, 0, getWorkingDimension() )
+		end
+	end
+)
+
 function disablePickups(bool)
 	if bool and not pickupsDisabled then
 		pickupsDisabled = true

[editor]/editor_main/server/saveloadtest_server.lua

@@ -444,6 +444,8 @@ function saveResourceCoroutineFunction ( resourceName, test, theSaver, client, g
 	if usedResources['race'] then
 		usedResources['editor_main'] = true
 	end
+	-- Add EDF namespace
+	xmlNodeSetAttribute(xmlNode, "xmlns:edf", "https://wiki.multitheftauto.com/wiki/Resource:Editor/EDF")
 	-- Save in the map node the used definitions
 	local usedDefinitions = ""
 	for resource2 in pairs(usedResources) do
@@ -598,6 +600,8 @@ function doQuickSaveCoroutineFunction(saveAs, dump, client)
 		if usedResources['race'] then
 			usedResources['editor_main'] = true
 		end
+		-- Add EDF namespace
+		xmlNodeSetAttribute(xmlNode, "xmlns:edf", "https://wiki.multitheftauto.com/wiki/Resource:Editor/EDF")
 		-- Save in the map node the used definitions
 		local usedDefinitions = ""
 		for resource2 in pairs(usedResources) do

[gamemodes]/[briefcaserace]/[maps]/br-sf-autoteams/briefcaserace-sf.map

@@ -1,4 +1,4 @@
-<map>
+<map edf:definitions="briefcaserace">
 
    <vehicle id="Sentinel" model="405" posX="-1988.01171875" posY="128.8193359375" posZ="27.413967132568" rotX="0" rotY="359.99450683594" rotZ="1.7303466796875" />
    <vehicle id="Blista Compact" model="496" posX="-1987.8955078125" posY="119.84765625" posZ="27.255165100098" rotX="0.0439453125" rotY="359.99450683594" rotZ="0.1702880859375" />

[gamemodes]/[briefcaserace]/[maps]/br-sf-teams/briefcaserace-sf.map

@@ -1,4 +1,4 @@
-<map>
+<map edf:definitions="briefcaserace">
 
   <team name="Hippies" color="#ff7f50" />
   <team name="Suits" color="#6495ed" />

[gamemodes]/[briefcaserace]/[maps]/br-sf/briefcaserace-sf.map

@@ -1,4 +1,4 @@
-<map>
+<map edf:definitions="briefcaserace">
 
   <spawnpoint id="spawnpoint_1" posX="-1982.86" posY="112.54" posZ="27.68" rot="0" skin="60"/>
   <spawnpoint id="spawnpoint_1" posX="-2035.7490234375" posY="139.54206848145" posZ="28.8359375" rot="270" skin="170"/>

[gamemodes]/[deathmatch]/[maps]/dm-port69/port69.map

@@ -1,4 +1,4 @@
-<map edf:definitions="editor_main">
+<map edf:definitions="deathmatch,editor_main">
     <spawnpoint id="spawnpoint (1)" interior="0" skin="0" dimension="0" posX="-1517.5894775391" posY="108.93153381348" posZ="17.328125" rotX="0" rotY="0" rotZ="117.11505126953" />
     <spawnpoint id="spawnpoint (2)" interior="0" skin="7" dimension="0" posX="-1697.6484375" posY="76.0380859375" posZ="4.0494818687439" rotX="0" rotY="0" rotZ="270.67498779297" />
     <spawnpoint id="spawnpoint (3)" interior="0" skin="27" dimension="0" posX="-1682.0185546875" posY="-112.748046875" posZ="4.0546860694885" rotX="0" rotY="0" rotZ="0" />

[gamemodes]/[race]/[maps]/race-10laphotring/10Lap Hotring.map

@@ -1,4 +1,4 @@
-<map>
+<map edf:definitions="race"> 
   <spawnpoint posX="-1354.557861" posY="1080.005005" posZ="1039.676392" rotation="80" vehicle="502" id="spawnpoint0" />
   <spawnpoint posX="-1355.963867" posY="1085.023560" posZ="1039.940186" rotation="80" vehicle="502" id="spawnpoint1" />
   <spawnpoint posX="-1353.029297" posY="1074.870605" posZ="1039.435181" rotation="80" vehicle="502" id="spawnpoint2" />