Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-11-10 19:08:22 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/huderlem/porymap into slam

Browse Source
This commit is contained in:
GriffinR
2024-10-25 14:33:00 -04:00
parent 10aa6f6c3f 178dd16cf1
commit 40d34b2d5b
20 changed files with 239 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/scriptapi/apimap.cpp
View File

@@ -533,13 +533,13 @@ QJSValue MainWindow::getSecondaryTilesetPalettesPreview() {
int MainWindow::getNumPrimaryTilesetMetatiles() {
if (!this->editor || !this->editor->layout || !this->editor->layout->tileset_primary)
return 0;
return this->editor->layout->tileset_primary->metatiles.length();
return this->editor->layout->tileset_primary->numMetatiles();
}
int MainWindow::getNumSecondaryTilesetMetatiles() {
if (!this->editor || !this->editor->layout || !this->editor->layout->tileset_secondary)
return 0;
return this->editor->layout->tileset_secondary->metatiles.length();
return this->editor->layout->tileset_secondary->numMetatiles();
}
int MainWindow::getNumPrimaryTilesetTiles() {

3
src/scriptapi/scripting.cpp
View File

@@ -29,8 +29,6 @@ void Scripting::stop() {
}
void Scripting::init(MainWindow *mainWindow) {
if (mainWindow->ui->graphicsView_Map)
mainWindow->ui->graphicsView_Map->clearOverlayMap();
Scripting::stop();
instance = new Scripting(mainWindow);
}
@@ -50,6 +48,7 @@ Scripting::Scripting(MainWindow *mainWindow) {
}
Scripting::~Scripting() {
if (mainWindow) mainWindow->clearOverlay();
this->engine->setInterrupted(true);
qDeleteAll(this->imageCache);
delete this->engine;