Cleanup

Isotarge · Isotarge · commit 42c6e7736d02 · 2019-02-17T22:16:55.000+10:30
- Prep work for main loop rewrite/cleanup
- Remove blank entries from user_preferences.lua
- If userpreferences entry is blank for a module, don't write it to file
on save
diff --git a/Docs/TODO.md b/Docs/TODO.md
@@ -3,8 +3,6 @@
 - Better High DPI support
 	- Editing ScriptHawk.UI.button_height does a [decent job](https://twitter.com/Isotarge/status/963992829746855937), but it's not perfect
 - Blank template that's more lightweight
-- Remove blank entries from user_preferences.lua
-	- If entry is blank for a module, don't write it to file on save
 - Allow modules to save extra settings via UserPreferences system
 - Save and Load ScriptHawk settings using UserPreferences system
 	- Joypad/Keyboard binds for D-Pad and L Button
diff --git a/ScriptHawk.lua b/ScriptHawk.lua
@@ -1575,7 +1575,8 @@ local function saveUserPreferences()
 		local file = io.open('user_preferences.lua', "w");
 		file:write("userPreferences={\n");
 		for moduleName, userPreference in pairs(userPreferences) do
-			file:write("\t"..moduleName.."={\n");
+			local shouldWriteModule = false;
+			local preferencesString = "\t"..moduleName.."={\n";
 			for OSDType, preference in pairs(userPreference) do
 				local valueToWrite = "true";
 				if preference == nil then
@@ -1584,10 +1585,14 @@ local function saveUserPreferences()
 					valueToWrite = "false";
 				end
 				if userPreferences[moduleName][OSDType] ~= defaultPreferences[moduleName][OSDType] then
-					file:write("\t\t"..OSDType.."="..valueToWrite..",\n");
+					shouldWriteModule = true;
+					preferencesString = preferencesString.."\t\t"..OSDType.."="..valueToWrite..",\n";
 				end
 			end
-			file:write("\t},\n");
+			if shouldWriteModule then
+				preferencesString = preferencesString.."\t},\n";
+				file:write(preferencesString);
+			end
 		end
 		file:write("};\n");
 		file:close();
@@ -1938,30 +1943,25 @@ local function plot_pos()
 	end
 
 	if not isLagged then
-		if not exactlyOneFrameHasPassed then
+		if exactlyOneFrameHasPassed then
+			dx = x - prev_x;
+			dy = y - prev_y;
+			dz = z - prev_z;
+			d = math.sqrt(dx*dx + dz*dz);
+
+			odometer = odometer + d;
+			max_dx = math.max(max_dx, math.abs(dx));
+			max_dy = math.max(max_dy, math.abs(dy));
+			max_dz = math.max(max_dz, math.abs(dz));
+			max_d = math.max(max_d, d);
+		else
 			dx = 0;
 			dy = 0;
 			dz = 0;
 			max_dx = 0.0;
 			max_dy = 0.0;
 			max_dz = 0.0;
 			max_d = 0.0;
-		else
-			dx = x - prev_x;
-			dy = y - prev_y;
-			dz = z - prev_z;
-		end
-
-		d = math.sqrt(dx*dx + dz*dz);
-		odometer = odometer + d;
-
-		max_dx = math.max(max_dx, math.abs(dx));
-		max_dy = math.max(max_dy, math.abs(dy));
-		max_dz = math.max(max_dz, math.abs(dz));
-		max_d = math.max(max_d, d);
-		if not exactlyOneFrameHasPassed then
-			max_dx = 0; max_dy = 0; max_dz = 0;
-			max_d = 0;
 		end
 
 		if ScriptHawk.smooth_moving_angle == true then
diff --git a/user_preferences.lua b/user_preferences.lua
@@ -1,80 +1,2 @@
 userPreferences={
-	lots={
-	},
-	bk={
-	},
-	mercs_sms={
-	},
-	the_ninja={
-	},
-	rats={
-	},
-	dkr={
-	},
-	balloon_fight={
-	},
-	rush_2049={
-	},
-	mm={
-	},
-	smash64={
-	},
-	dk64={
-	},
-	ts2={
-	},
-	sonic1_sms={
-	},
-	taz={
-	},
-	cbfd={
-	},
-	shinobi_world={
-	},
-	GBA_DrillDozer={
-	},
-	sm64={
-	},
-	golvellius={
-	},
-	galahad={
-	},
-	psycho_fox={
-	},
-	tftt={
-	},
-	wonder_boy_monster_world={
-	},
-	oot={
-	},
-	impossible_mission={
-	},
-	sssv={
-	},
-	penguin_land={
-	},
-	metroid={
-	},
-	crash2={
-	},
-	GBA_Ty2={
-	},
-	gran_turismo_2={
-	},
-	rayman_2={
-	},
-	elmo={
-	},
-	golden_axe_warrior={
-	},
-	bt={
-	},
-	crash1={
-	},
-	crash3={
-	},
-	ej3d={
-	},
-	miracle_world={
-	},
 };
