mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-24 07:20:55 +00:00
Code Issues Releases Wiki Activity

Remove unused maxZoom attrib and related code

Browse source
This commit is contained in:
fgenesis 2023-07-03 18:37:47 +02:00
parent 69ffb75746
commit 9d7dbe5435
3 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Aquaria/Avatar.cpp
View file

@ -6470,16 +6470,8 @@ void Avatar::onUpdate(float dt)
myZoom.interpolateTo(zoomMove, time, 0, 0, 1); myZoom.interpolateTo(zoomMove, time, 0, 0, 1);
} }
if (myZoom.x < game->maxZoom) core->globalScale.x = myZoom.x;
{ core->globalScale.y = myZoom.y;
core->globalScale.x = game->maxZoom;
core->globalScale.y = game->maxZoom;
}
else
{
core->globalScale.x = myZoom.x;
core->globalScale.y = myZoom.y;
}
core->globalScaleChanged(); core->globalScaleChanged();
} }

8
Aquaria/Game.cpp
View file

@ -1390,13 +1390,6 @@ bool Game::loadSceneXML(std::string scene)
os << "cameraConstrained: " << cameraConstrained; os << "cameraConstrained: " << cameraConstrained;
debugLog(os.str()); debugLog(os.str());
} }
if (level->Attribute("maxZoom"))
{
maxZoom = atof(level->Attribute("maxZoom"));
std::ostringstream os;
os << maxZoom;
levelSF->SetAttribute("maxZoom", os.str().c_str());
}
gradTop = gradBtm = Vector(0,0,0); gradTop = gradBtm = Vector(0,0,0);
if (level->Attribute("gradient")) if (level->Attribute("gradient"))
@ -2597,7 +2590,6 @@ void Game::applyState()
dsq->getRenderObjectLayer(LR_BLACKGROUND)->update = false; dsq->getRenderObjectLayer(LR_BLACKGROUND)->update = false;
grad = 0; grad = 0;
maxZoom = -1;
maxLookDistance = 600; maxLookDistance = 600;
saveFile = 0; saveFile = 0;
deathTimer = 0.9f; deathTimer = 0.9f;

1
Aquaria/Game.h
View file

@ -228,7 +228,6 @@ public:
std::string overrideMusic; std::string overrideMusic;
void resetFromTitle(); void resetFromTitle();
float maxZoom;
float maxLookDistance; float maxLookDistance;
XMLDocument *saveFile; XMLDocument *saveFile;