diff --git a/Aquaria/DSQ.cpp b/Aquaria/DSQ.cpp index 7965311..78c4cfe 100644 --- a/Aquaria/DSQ.cpp +++ b/Aquaria/DSQ.cpp @@ -2510,13 +2510,6 @@ void DSQ::unloadMods() #endif } -void DSQ::applyParallaxUserSettings() -{ - getRenderObjectLayer(LR_ELEMENTS10)->visible = user.video.parallaxOn0; - getRenderObjectLayer(LR_ELEMENTS11)->visible = user.video.parallaxOn1; - getRenderObjectLayer(LR_ELEMENTS12)->visible = user.video.parallaxOn2; -} - void DSQ::clearModSelector() { if (blackout) diff --git a/Aquaria/DSQ.h b/Aquaria/DSQ.h index 81600a6..b37ace0 100644 --- a/Aquaria/DSQ.h +++ b/Aquaria/DSQ.h @@ -161,8 +161,6 @@ public: void fade(float alpha, float time); - void applyParallaxUserSettings(); - void nag(NagType type); void action(int id, int state, int source, InputDevice device); diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp index f22d0aa..844db0e 100644 --- a/Aquaria/Game.cpp +++ b/Aquaria/Game.cpp @@ -2583,8 +2583,6 @@ void Game::applyState() setElementLayerVisible(i-LR_ELEMENTS1, true); } - dsq->applyParallaxUserSettings(); - controlHintTimer = 0; cameraConstrained = true; // reset parallax @@ -3638,7 +3636,6 @@ void Game::toggleHelpScreen(bool on, const std::string &label) { core->getRenderObjectLayer(i)->visible = true; } - dsq->applyParallaxUserSettings(); dsq->screenTransition->transition(MENUPAGETRANSTIME); diff --git a/Aquaria/UserSettings.cpp b/Aquaria/UserSettings.cpp index aa9d3a1..651b71b 100644 --- a/Aquaria/UserSettings.cpp +++ b/Aquaria/UserSettings.cpp @@ -117,12 +117,6 @@ void UserSettings::save() } xml_video->InsertEndChild(xml_fpsSmoothing); - XMLElement *xml_parallax = doc.NewElement("Parallax"); - std::ostringstream os; - os << video.parallaxOn0 << " " << video.parallaxOn1 << " " << video.parallaxOn2; - xml_parallax->SetAttribute("on", os.str().c_str()); - xml_video->InsertEndChild(xml_parallax); - XMLElement *xml_numParticles = doc.NewElement("NumParticles"); xml_numParticles->SetAttribute("v", video.numParticles); xml_video->InsertEndChild(xml_numParticles); @@ -426,17 +420,6 @@ bool UserSettings::load(bool doApply, const std::string &overrideFile) readInt(xml_video, "FpsSmoothing", "v", &video.fpsSmoothing); - - XMLElement *xml_parallax = xml_video->FirstChildElement("Parallax"); - if (xml_parallax) - { - if (xml_parallax->Attribute("on")) - { - std::istringstream is(xml_parallax->Attribute("on")); - is >> video.parallaxOn0 >> video.parallaxOn1 >> video.parallaxOn2; - } - } - readInt(xml_video, "NumParticles", "v", &video.numParticles); XMLElement *xml_screenMode = xml_video->FirstChildElement("ScreenMode"); diff --git a/Aquaria/UserSettings.h b/Aquaria/UserSettings.h index 72163f4..3214f8c 100644 --- a/Aquaria/UserSettings.h +++ b/Aquaria/UserSettings.h @@ -58,7 +58,6 @@ public: { Video() { numParticles = 2048; - parallaxOn0 = parallaxOn1 = parallaxOn2 = 1; saveSlotScreens = 1; blur = 1; noteEffects = 0; @@ -80,7 +79,6 @@ public: int fpsSmoothing; int resx, resy, full, fbuffer, bits, vsync, darkfbuffer, darkbuffersize, hz, displayindex; int saveSlotScreens; - int parallaxOn0, parallaxOn1, parallaxOn2; int numParticles; int worldMapRevealMethod; } video;