add area saveloading, fix .ogg to .flac

Author: pawnishoovy

Data/Base.rte/Activities/Utility/SaveLoadHandler.lua

@@ -57,9 +57,11 @@ function SaveLoadHandler:SerializeTable(val, name, skipnewlines, depth)
 		tmp = tmp .. (val and "true" or "false")
 	elseif val.Magnitude then -- ghetto vector check
 		tmp = tmp .. string.format("%q", "Vector(" .. val.X .. "," .. val.Y .. ")")
-	elseif val.PresetName and IsMOSRotating(val) then
+	elseif val.PresetName and IsMOSRotating(val) then -- IsMOSRotating freaks out if we give it something that isn't a preset at all... ghetto here too
 		val:SetNumberValue("saveLoadHandlerUniqueID", val.UniqueID);
 		tmp = tmp .. string.format("%q", "SAVELOADHANDLERUNIQUEID_" .. tostring(val.UniqueID))
+	elseif val.FirstBox then -- ghetto area check
+		tmp = tmp .. string.format("%q", "SAVELOADHANDLERAREA_" .. tostring(val.Name))
 	else
 		tmp = tmp .. '"[inserializeable datatype:' .. type(val) .. ']"'
 	end
@@ -70,18 +72,6 @@ function SaveLoadHandler:SerializeTable(val, name, skipnewlines, depth)
 	return tmp
 end
 
-function SaveLoadHandler:ParseTableForVectors(tab)
-	for k, v in pairs(tab) do
-		if type(v) == "string" and string.find(v, "Vector%(") then
-			local vector = loadstring("return " .. v)();
-			tab[k] = vector;	
-		elseif type(v) == "table" then
-			self:ParseTableForVectors(v);
-		end
-	end
-		
-end
-
 function SaveLoadHandler:ParseTableForMOs(tab)
 
 	for k, v in pairs(tab) do
@@ -169,6 +159,31 @@ function SaveLoadHandler:ParseTableForMOs(tab)
 	end
 end
 
+function SaveLoadHandler:ParseTableForVectors(tab)
+	for k, v in pairs(tab) do
+		if type(v) == "string" and string.find(v, "Vector%(") then
+			local vector = loadstring("return " .. v)();
+			tab[k] = vector;	
+		elseif type(v) == "table" then
+			self:ParseTableForVectors(v);
+		end
+	end
+		
+end
+
+function SaveLoadHandler:ParseTableForAreas(tab)
+	for k, v in pairs(tab) do
+		if type(v) == "string" and string.find(v, "SAVELOADHANDLERAREA_") then
+			local areaName = string.sub(v, 21, -1);
+			local area = SceneMan.Scene:GetOptionalArea(areaName);
+			tab[k] = area;	
+		elseif type(v) == "table" then
+			self:ParseTableForAreas(v);
+		end
+	end
+		
+end
+
 function SaveLoadHandler:ReadSavedStringAsTable(name)
 	print(ActivityMan:GetActivity())
 	print(ActivityMan:GetActivity():LoadString(name))
@@ -183,6 +198,7 @@ function SaveLoadHandler:ReadSavedStringAsTable(name)
 	print("Parsing table for MOs: " .. name);
 	self:ParseTableForMOs(tab);
 	self:ParseTableForVectors(tab);
+	self:ParseTableForAreas(tab);
 
 	return tab;
 

Data/Browncoats.rte/Scenes/Sounds.ini

@@ -5,7 +5,7 @@ AddSoundContainer = SoundContainer
 	PresetName = Yskely Refinery Oil Spout Engage
 	Immobile = 1
 	Priority = 127 // just above the default
-	AddSound = Browncoats.rte/Scenes/Sounds/Refinery_OilSpoutEngage.ogg
+	AddSound = Browncoats.rte/Scenes/Sounds/Refinery_OilSpoutEngage.flac
 
 AddSoundContainer = SoundContainer
 	PresetName = Yskely Refinery Ambience Ext