mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-16 21:05:22 +00:00
Code Issues Releases Wiki Activity

don't delete all tiles when closing map load name prompt without actually loading a map

Browse source
This commit is contained in:
fgenesis 2024-01-11 22:57:25 +01:00
parent b63d27b7b5
commit 5dccefffc0
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Aquaria/SceneEditor.cpp
View file

@ -1846,7 +1846,7 @@ void SceneEditor::rotateElement2()
placer->rotation.z += 360; placer->rotation.z += 360;
} }
void SceneEditor::loadSceneByName() bool SceneEditor::loadSceneByName()
{ {
std::string s = dsq->getUserInputString("Enter Name of Map to Load"); std::string s = dsq->getUserInputString("Enter Name of Map to Load");
if (!s.empty()) if (!s.empty())
@ -1854,7 +1854,9 @@ void SceneEditor::loadSceneByName()
game->noSceneTransitionFadeout = true; game->noSceneTransitionFadeout = true;
game->fullTilesetReload = true; game->fullTilesetReload = true;
game->transitionToScene(s); game->transitionToScene(s);
return true;
} }
return false;
} }
void SceneEditor::reloadScene() void SceneEditor::reloadScene()
@ -1869,15 +1871,19 @@ void SceneEditor::reloadScene()
void SceneEditor::loadScene() void SceneEditor::loadScene()
{ {
bool reload;
if (core->getShiftState()) if (core->getShiftState())
{ {
loadSceneByName(); reload = loadSceneByName();
} }
else else
{ {
reloadScene(); reloadScene();
reload = true;
} }
if(reload)
{
// HACK: reload stuff when (re-) loading a map this way // HACK: reload stuff when (re-) loading a map this way
particleManager->loadParticleBank(dsq->particleBank1, dsq->particleBank2); particleManager->loadParticleBank(dsq->particleBank1, dsq->particleBank2);
Shot::loadShotBank(dsq->shotBank1, dsq->shotBank2); Shot::loadShotBank(dsq->shotBank1, dsq->shotBank2);
@ -1885,6 +1891,7 @@ void SceneEditor::loadScene()
dsq->loadTileEffects(); dsq->loadTileEffects();
dsq->continuity.loadSongBank(); dsq->continuity.loadSongBank();
dsq->loadStringBank(); dsq->loadStringBank();
}
} }
void SceneEditor::saveScene() void SceneEditor::saveScene()

2
Aquaria/SceneEditor.h
View file

@ -217,7 +217,7 @@ protected:
void addMainMenuItem(const std::string &label, int bid); void addMainMenuItem(const std::string &label, int bid);
void loadSceneByName(); bool loadSceneByName();
void reloadScene(); void reloadScene();
void mouseButtonLeft(); void mouseButtonLeft();