mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-27 08:34:02 +00:00
Code Issues Releases Wiki Activity

remove parallax settings from config

Browse source 
there's no reason for this to exist, at all
This commit is contained in:
fgenesis 2023-07-05 03:59:41 +02:00
parent 1b02efc96d
commit 578c8ecc45
5 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Aquaria/DSQ.cpp
View file

@ -2510,13 +2510,6 @@ void DSQ::unloadMods()
#endif #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() void DSQ::clearModSelector()
{ {
if (blackout) if (blackout)

2
Aquaria/DSQ.h
View file

@ -161,8 +161,6 @@ public:
void fade(float alpha, float time); void fade(float alpha, float time);
void applyParallaxUserSettings();
void nag(NagType type); void nag(NagType type);
void action(int id, int state, int source, InputDevice device); void action(int id, int state, int source, InputDevice device);

3
Aquaria/Game.cpp
View file

@ -2583,8 +2583,6 @@ void Game::applyState()
setElementLayerVisible(i-LR_ELEMENTS1, true); setElementLayerVisible(i-LR_ELEMENTS1, true);
} }
dsq->applyParallaxUserSettings();
controlHintTimer = 0; controlHintTimer = 0;
cameraConstrained = true; cameraConstrained = true;
// reset parallax // reset parallax
@ -3638,7 +3636,6 @@ void Game::toggleHelpScreen(bool on, const std::string &label)
{ {
core->getRenderObjectLayer(i)->visible = true; core->getRenderObjectLayer(i)->visible = true;
} }
dsq->applyParallaxUserSettings();
dsq->screenTransition->transition(MENUPAGETRANSTIME); dsq->screenTransition->transition(MENUPAGETRANSTIME);

17
Aquaria/UserSettings.cpp
View file

@ -117,12 +117,6 @@ void UserSettings::save()
} }
xml_video->InsertEndChild(xml_fpsSmoothing); 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"); XMLElement *xml_numParticles = doc.NewElement("NumParticles");
xml_numParticles->SetAttribute("v", video.numParticles); xml_numParticles->SetAttribute("v", video.numParticles);
xml_video->InsertEndChild(xml_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); 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); readInt(xml_video, "NumParticles", "v", &video.numParticles);
XMLElement *xml_screenMode = xml_video->FirstChildElement("ScreenMode"); XMLElement *xml_screenMode = xml_video->FirstChildElement("ScreenMode");

2
Aquaria/UserSettings.h
View file

@ -58,7 +58,6 @@ public:
{ {
Video() { Video() {
numParticles = 2048; numParticles = 2048;
parallaxOn0 = parallaxOn1 = parallaxOn2 = 1;
saveSlotScreens = 1; saveSlotScreens = 1;
blur = 1; blur = 1;
noteEffects = 0; noteEffects = 0;
@ -80,7 +79,6 @@ public:
int fpsSmoothing; int fpsSmoothing;
int resx, resy, full, fbuffer, bits, vsync, darkfbuffer, darkbuffersize, hz, displayindex; int resx, resy, full, fbuffer, bits, vsync, darkfbuffer, darkbuffersize, hz, displayindex;
int saveSlotScreens; int saveSlotScreens;
int parallaxOn0, parallaxOn1, parallaxOn2;
int numParticles; int numParticles;
int worldMapRevealMethod; int worldMapRevealMethod;
} video; } video;