tiled.worlds no longer crashes

mapeditor · Jan 12, 2024 · 41f89d5 · 41f89d5
1 parent a95d295
commit 41f89d5
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 17 deletions.
diff --git a/src/libtiled/logginginterface.cpp b/src/libtiled/logginginterface.cpp
@@ -188,6 +188,7 @@ SelectCustomProperty::SelectCustomProperty(QString fileName,
         id = static_cast<const WangColor*>(object)->colorIndex();
         break;
     case Object::ProjectType:
+    case Object::WorldType:
         break;
     }
 }

diff --git a/src/libtiled/object.h b/src/libtiled/object.h
@@ -51,6 +51,7 @@ class TILEDSHARED_EXPORT Object
         WangSetType         = 0x040,
         WangColorType       = 0x080,
         ProjectType         = 0x100,
+        WorldType           = 0x200,
     };
 
     explicit Object(TypeId typeId, const QString &className = QString())

diff --git a/src/tiled/editableobject.cpp b/src/tiled/editableobject.cpp
@@ -144,6 +144,7 @@ static Map *mapForObject(Object *object)
     case Object::WangSetType:
     case Object::WangColorType:
     case Object::ProjectType:
+    case Object::WorldType:
         break;
     }
     return nullptr;

diff --git a/src/tiled/editableworld.cpp b/src/tiled/editableworld.cpp
@@ -26,15 +26,16 @@
 namespace Tiled {
 
 ScriptWorld::ScriptWorld(World *world)
-    : Object(*this)
+    : Object(WorldType)
     , world(world)
 {
 }
 
 EditableWorld::EditableWorld(WorldDocument *worldDocument, QObject *parent)
-    : EditableAsset(worldDocument, &mWorldObject, parent),
-    mWorldObject(ScriptWorld(WorldManager::instance().worlds().value(worldDocument->fileName())))
+    : EditableAsset(worldDocument, nullptr, parent)
+    , mWorldObject(WorldManager::instance().worlds().value(worldDocument->fileName()))
 {
+    setObject(&mWorldObject);
 }
 
 

diff --git a/src/tiled/exporthelper.cpp b/src/tiled/exporthelper.cpp
@@ -207,6 +207,7 @@ void ExportHelper::resolveProperties(Object *object) const
         break;
     case Object::WangColorType:
     case Object::ProjectType:
+    case Object::WorldType:
         break;
     }
 

diff --git a/src/tiled/propertybrowser.cpp b/src/tiled/propertybrowser.cpp
@@ -484,11 +484,7 @@ static void addAutomappingProperties(Properties &properties, const Object *objec
                 addRuleOptions();
         break;
     }
-    case Object::TilesetType:
-    case Object::TileType:
-    case Object::WangSetType:
-    case Object::WangColorType:
-    case Object::ProjectType:
+    default:
         break;
     }
 }
@@ -696,7 +692,8 @@ void PropertyBrowser::valueChanged(QtProperty *property, const QVariant &val)
     case Object::TileType:              applyTileValue(id, val); break;
     case Object::WangSetType:           applyWangSetValue(id, val); break;
     case Object::WangColorType:         applyWangColorValue(id, val); break;
-    case Object::ProjectType: break;
+    case Object::ProjectType:           break;
+    case Object::WorldType:             break;
     }
 }
 
@@ -1804,7 +1801,8 @@ void PropertyBrowser::addProperties()
     case Object::TileType:              addTileProperties(); break;
     case Object::WangSetType:           addWangSetProperties(); break;
     case Object::WangColorType:         addWangColorProperties(); break;
-    case Object::ProjectType: break;
+    case Object::ProjectType:           break;
+    case Object::WorldType:             break;
     }
 
     // Make sure certain properties are collapsed, to save space
@@ -2023,6 +2021,8 @@ void PropertyBrowser::updateProperties()
     }
     case Object::ProjectType:
         break;
+    case Object::WorldType:
+        break;
     }
 }
 

diff --git a/src/tiled/scriptmodule.cpp b/src/tiled/scriptmodule.cpp
@@ -702,14 +702,16 @@ void ScriptModule::currentDocumentChanged(Document *document)
 QList<Tiled::EditableAsset*> ScriptModule::worlds() const
 {
     QList<Tiled::EditableAsset*> worlds;
-    for (const World *world : WorldManager::instance().worlds())
-    {
-        const QString worldFile = world->fileName;
-        WorldDocument *worldDocument = new WorldDocument(worldFile);
-        // TODO crashing, store references to the world document somewhere to prevent it from freeing?
-        EditableAsset *editableWorld = worldDocument->createEditable().get();
-        worlds.append(editableWorld);
+
+    auto documentManager = DocumentManager::maybeInstance();
+    if (!documentManager)
+        return worlds;
+
+    for (const World *world : WorldManager::instance().worlds()) {
+        WorldDocument *worldDocument = documentManager->ensureWorldDocument(world->fileName);
+        worlds.append(worldDocument->editable());
     }
+
     return worlds;
 }