more refactoring for iOS

src/client/Options.h

@@ -94,9 +94,6 @@ typedef std::vector<std::string> StringVector;
 class Options
 {
 public:
-    // deepfriedwaffles: for iOS, was getting compile errors saying: No member named 'sound' in 'Options' and No member named 'music' in 'Options' so I floated them here. 1.0f means full volume out of the box, but if everything is too loud, you might want to try adjusting this
-    float sound = 1.0f;
-    float music = 1.0f;
     
     static bool debugGl;
 
@@ -161,7 +158,9 @@ private:
         if (m_options[key] == nullptr) return nullptr;
         return dynamic_cast<T*>(m_options[key]); 
     }
-
+// apple stuff
+    float sound;
+    float music;
 	std::array<Option*, OPTIONS_COUNT> m_options;
 	OptionsFile optionsFile;