mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-03 18:14:01 +00:00
Code Issues Releases Wiki Activity

fix long-standing editor bug that would cause entities to be moved around

Browse source 
This was caused by early deletion of entities.
If new ones were spawned upon further editing of a map, it could re-use
entity IDs and cause both new and old entities to be spawned in the position
of the new entity (due to EntitySaveData of the old one still intact).

This is now prevented by not touching the ID range of map entities.

Should probably make an offline tool to recompress entity IDs...
This commit is contained in:
fgenesis 2023-10-27 14:20:19 +02:00
parent 9fd024dadd
commit fc38d375bb
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Aquaria/Game.cpp
View file

@ -228,6 +228,7 @@ Game::Game() : StateObject()
doScreenTrans = false; doScreenTrans = false;
noSceneTransitionFadeout = false; noSceneTransitionFadeout = false;
fullTilesetReload = false; fullTilesetReload = false;
highestLoadedEntityID = 0;
} }
Game::~Game() Game::~Game()
@ -943,7 +944,7 @@ EntitySaveData *Game::getEntitySaveDataForEntity(Entity *e)
int Game::findUnusedEntityID(bool temporary) const int Game::findUnusedEntityID(bool temporary) const
{ {
const int inc = temporary ? -1 : 1; const int inc = temporary ? -1 : 1;
int id = 0; int id = temporary ? 0 : highestLoadedEntityID + 1; // never touch entity IDs that were in use in the map xml
retry: retry:
id += inc; id += inc;
FOR_ENTITIES(i) FOR_ENTITIES(i)
@ -1845,9 +1846,11 @@ bool Game::loadSceneXML(std::string scene)
void Game::spawnEntities(const EntitySaveData *sav, size_t n) void Game::spawnEntities(const EntitySaveData *sav, size_t n)
{ {
std::vector<size_t> conflicting, usable; std::vector<size_t> conflicting, usable;
int highest = 0;
for(size_t i = 0; i < n; ++i) for(size_t i = 0; i < n; ++i)
{ {
const EntitySaveData& es = sav[i]; const EntitySaveData& es = sav[i];
highest = std::max(es.id, highest);
// check for ID conflicts // check for ID conflicts
int id = es.id; int id = es.id;
@ -1870,6 +1873,8 @@ void Game::spawnEntities(const EntitySaveData *sav, size_t n)
conflicting.push_back(i); conflicting.push_back(i);
} }
highestLoadedEntityID = highest;
{ {
std::ostringstream os; std::ostringstream os;
os << "Game::spawnEntities: Spawning " << usable.size() << " entities"; os << "Game::spawnEntities: Spawning " << usable.size() << " entities";
@ -1888,7 +1893,7 @@ void Game::spawnEntities(const EntitySaveData *sav, size_t n)
} }
// spawn and renumber the rest // spawn and renumber the rest
int lastid = 0; int lastid = highest;
for(size_t i = 0; i < conflicting.size(); ++i) for(size_t i = 0; i < conflicting.size(); ++i)
{ {
// find an unused ID // find an unused ID

1
Aquaria/Game.h
View file

@ -422,6 +422,7 @@ public:
void onContinuityReset(); void onContinuityReset();
protected: protected:
unsigned highestLoadedEntityID;
void toggleHelpScreen(bool on, const std::string &label=""); void toggleHelpScreen(bool on, const std::string &label="");
void onToggleHelpScreen(); void onToggleHelpScreen();