mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-05-11 11:33:56 +00:00
Code Issues Releases Wiki Activity

Fix map grid not drawing and tiles not regenerating after editor obs regen (F11)

Browse source 
forgot to get max grid dimensions after clearing and recomputing the grid
This commit is contained in:
fgenesis 2024-05-06 04:26:54 +02:00
parent 0326800940
commit 3adc3f0c99
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Aquaria/Game.cpp
View file

@ -556,7 +556,7 @@ void Game::reconstructGrid(bool force)
dsq->tilemgr.exportGridFillers(fillers); dsq->tilemgr.exportGridFillers(fillers);
std::ostringstream os; std::ostringstream os;
os << "ReconstructGrid using " << fillers.size() << " tiles"; os << "ReconstructGrid using " << fillers.size() << " solid tiles";
debugLog(os.str()); debugLog(os.str());
for (size_t i = 0; i < fillers.size(); i++) for (size_t i = 0; i < fillers.size(); i++)
@ -1802,6 +1802,14 @@ next_SE:
return true; return true;
} }
void Game::handleEditorMapGridUpdate()
{
reconstructGrid(true);
findMaxCameraValues();
updateGridRender(OT_MASK_BLACK);
}
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;

2
Aquaria/Game.h
View file

@ -400,6 +400,8 @@ public:
void onContinuityReset(); void onContinuityReset();
void onPrepareRender(); void onPrepareRender();
void handleEditorMapGridUpdate();
protected: protected:
unsigned highestLoadedEntityID; unsigned highestLoadedEntityID;

3
Aquaria/SceneEditor.cpp
View file

@ -1623,8 +1623,7 @@ void SceneEditor::generateLevel()
} }
} }
game->reconstructGrid(true); game->handleEditorMapGridUpdate();
game->updateGridRender(OT_MASK_BLACK);
maxX--; maxX--;
maxY--; maxY--;