Merge pull request #8 from mrSkortch/development

Fixed an oops

mist.lua

@@ -8,7 +8,7 @@ mist = {}
 -- don't change these
 mist.majorVersion = 3
 mist.minorVersion = 5
-mist.build = 35 
+mist.build = 37 
 
 
 
@@ -1829,7 +1829,7 @@ for coa_name, coa_data in pairs(env.mission.coalition) do
 										mist.DBs.units[coa_name][countryName][category][group_num]["category"] = category
 										mist.DBs.units[coa_name][countryName][category][group_num]["coalition"] = coa_name
 										mist.DBs.units[coa_name][countryName][category][group_num]["country"] = countryName
-										mist.DBs.units[coa_name][countryName][category][group_num]["countryId"] = cntry_id
+										mist.DBs.units[coa_name][countryName][category][group_num]["countryId"] = cntry_data.id
 										mist.DBs.units[coa_name][countryName][category][group_num]["startTime"] = group_data.start_time
 										mist.DBs.units[coa_name][countryName][category][group_num]["task"] = group_data.task
 										mist.DBs.units[coa_name][countryName][category][group_num]["units"] = {}
@@ -1850,7 +1850,7 @@ for coa_name, coa_data in pairs(env.mission.coalition) do
 											units_tbl[unit_num]["category"] = category
 											units_tbl[unit_num]["coalition"] = coa_name
 											units_tbl[unit_num]["country"] = countryName
-											units_tbl[unit_num]["countryId"] = cntry_id
+											units_tbl[unit_num]["countryId"] = cntry_data.id
 											units_tbl[unit_num]["heading"] = unit_data.heading
 											units_tbl[unit_num]["playerCanDrive"] = unit_data.playerCanDrive
 											units_tbl[unit_num]["alt"] = unit_data.alt
@@ -4780,7 +4780,7 @@ mist.getCurrentGroupData = function(gpName)
 		newData.name = gpName
 		newData.groupId = tonumber(newGroup:getID())
 		newData.category = newGroup:getCategory()
-		
+		newData.groupName = gpName
         
 		if newData.category == 2 then
 			newData.category = 'vehicle'
@@ -5026,9 +5026,13 @@ mist.teleportToPoint = function(vars) -- main teleport function that all of tele
 	end
 	
 	--tostring, tostring(),
+	if not newGroupData.country and mist.DBs.groupsByName[newGroupData.groupName].country then
+		newGroupData.country = mist.DBs.groupsByName[newGroupData.groupName].country
+	end
+	if not newGroupData.category and mist.DBs.groupsByName[newGroupData.groupName].category then
+		newGroupData.category = mist.DBs.groupsByName[newGroupData.groupName].category
+	end
 	
-	newGroupData.country = mist.DBs.groupsByName[newGroupData.groupName].country
-	newGroupData.category = mist.DBs.groupsByName[newGroupData.groupName].category
 	if route then
 		newGroupData.route = route
 	end