From 31f790299c1649680b48c00230e89318d864624f Mon Sep 17 00:00:00 2001 From: Lyuma Date: Thu, 26 Aug 2021 20:46:51 -0700 Subject: Use OrderedHashMap for autoloads to preserve order --- main/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'main') diff --git a/main/main.cpp b/main/main.cpp index a90dc121f3..44c0ba4902 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2125,11 +2125,11 @@ bool Main::start() { if (!project_manager && !editor) { // game if (game_path != "" || script != "") { //autoload - Map autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + OrderedHashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); //first pass, add the constants so they exist before any script is loaded - for (Map::Element *E = autoloads.front(); E; E = E->next()) { - const ProjectSettings::AutoloadInfo &info = E->get(); + for (OrderedHashMap::Element E = autoloads.front(); E; E = E.next()) { + const ProjectSettings::AutoloadInfo &info = E.get(); if (info.is_singleton) { for (int i = 0; i < ScriptServer::get_language_count(); i++) { @@ -2140,8 +2140,8 @@ bool Main::start() { //second pass, load into global constants List to_add; - for (Map::Element *E = autoloads.front(); E; E = E->next()) { - const ProjectSettings::AutoloadInfo &info = E->get(); + for (OrderedHashMap::Element E = autoloads.front(); E; E = E.next()) { + const ProjectSettings::AutoloadInfo &info = E.get(); RES res = ResourceLoader::load(info.path); ERR_CONTINUE_MSG(res.is_null(), "Can't autoload: " + info.path); -- cgit v1.2.3