From 6e58f0c2ea47c33555e236c5f3bcb64a89c633fc Mon Sep 17 00:00:00 2001
From: Zach Jordan <zjordan58@fairport.org>
Date: Wed, 17 May 2023 08:55:33 -0400
Subject: yay

---
 src/gui/SettingsController.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/gui/SettingsController.java')

diff --git a/src/gui/SettingsController.java b/src/gui/SettingsController.java
index 39072ac..66da588 100644
--- a/src/gui/SettingsController.java
+++ b/src/gui/SettingsController.java
@@ -21,10 +21,6 @@ public class SettingsController
 	
 	public void saveAndWrite(int newEffVol, int newMusVol, boolean isFull)
 	{
-		effectsVol = newEffVol;
-		musicVol = newMusVol;
-		fullscreen = isFull;
-		
 		
 	}
 	
@@ -36,8 +32,11 @@ public class SettingsController
 		{
 			Object obj = jsonParser.parse(reader); 
 			
-			settings = (JSONObject)(obj); //converts read object to a JSONObjec
-			effectsVol = settings.get("effectsVol");
+			settings = (JSONObject)(obj); //converts read object to a JSONObject
+			
+			effectsVol = (int) settings.get("effectsVol");
+			musicVol = (int) settings.get("musicVol");
+			fullscreen = (boolean) settings.get("fullscreen");
 		}
 		catch (FileNotFoundException e) 
 		{
-- 
cgit v1.2.3