When using the File -> Import, you can now import other world files / plugins

Author: nickgammon

dialogs/ImportXMLdlg.cpp

@@ -195,7 +195,7 @@ void CImportXMLdlg::ImportArchive (CArchive & ar)
 
       // do it
       m_pDoc->Load_World_XML (ar, 
-                              iMask | XML_NO_PLUGINS, 
+                              iMask | XML_NO_PLUGINS | XML_IMPORT_MAIN_FILE_ONLY, 
                               0,          // load flags
                               &iTriggers,  
                               &iAliases,   

dialogs/world_prefs/genpropertypage.cpp

@@ -1794,7 +1794,7 @@ CString strContents;
 
   try
     {
-    iCount = m_doc->Load_World_XML (ar, m_iMask | XML_NO_PLUGINS | XML_PASTE_DUPLICATE); 
+    iCount = m_doc->Load_World_XML (ar, m_iMask | XML_NO_PLUGINS | XML_PASTE_DUPLICATE | XML_IMPORT_MAIN_FILE_ONLY); 
     }
   catch (CArchiveException* e) 
     {

dialogs/world_prefs/prefspropertypages.cpp

@@ -7831,7 +7831,7 @@ CArchive * ar = NULL;
 
     if (IsArchiveXML (*ar))
       {
-      iCount = m_doc->Load_World_XML (*ar, XML_VARIABLES | XML_NO_PLUGINS, false); 
+      iCount = m_doc->Load_World_XML (*ar, XML_VARIABLES | XML_NO_PLUGINS | XML_IMPORT_MAIN_FILE_ONLY, false); 
       delete ar;      // delete archive
       ar = NULL;
       delete xmlf;       // delete file

doc.h

@@ -1556,6 +1556,7 @@ class CMUSHclientDoc : public CDocument
 #define XML_NO_PLUGINS 0x0800
 #define XML_OVERWRITE  0x1000
 #define XML_PASTE_DUPLICATE 0x2000
+#define XML_IMPORT_MAIN_FILE_ONLY 0x4000
 
   // XML saving
   void Save_World_XML (CArchive& ar, 

evaluate.cpp

@@ -605,27 +605,27 @@ CArchive * ar = NULL;
         case TRIGGER: 
           if (replace)
             DELETE_MAP (m_TriggerMap, CTrigger);
-          Load_World_XML (*ar, XML_TRIGGERS | XML_NO_PLUGINS);  
+          Load_World_XML (*ar, XML_TRIGGERS | XML_NO_PLUGINS | XML_IMPORT_MAIN_FILE_ONLY);  
           break;  
 
         case ALIAS:   
           if (replace)
             DELETE_MAP (m_AliasMap, CAlias);
-          Load_World_XML (*ar, XML_ALIASES | XML_NO_PLUGINS);  
+          Load_World_XML (*ar, XML_ALIASES | XML_NO_PLUGINS | XML_IMPORT_MAIN_FILE_ONLY);  
           break;  
 
         case COLOUR:  
-          Load_World_XML (*ar, XML_COLOURS | XML_NO_PLUGINS);  
+          Load_World_XML (*ar, XML_COLOURS | XML_NO_PLUGINS | XML_IMPORT_MAIN_FILE_ONLY);  
           break;  
 
         case MACRO:   
-          Load_World_XML (*ar, XML_MACROS | XML_NO_PLUGINS);  
+          Load_World_XML (*ar, XML_MACROS | XML_NO_PLUGINS | XML_IMPORT_MAIN_FILE_ONLY);  
           break;   
 
         case TIMER:   
           if (replace)
             DELETE_MAP (m_TimerMap, CTimer);
-          Load_World_XML (*ar, XML_TIMERS | XML_NO_PLUGINS);  
+          Load_World_XML (*ar, XML_TIMERS | XML_NO_PLUGINS | XML_IMPORT_MAIN_FILE_ONLY);  
           break;  
 
         } // end of switch

scripting/methods/methods_xml.cpp

@@ -57,7 +57,7 @@ long iCount = 0;
       // do it
       Load_World_XML (ar, 
                       // don't load plugins or general world config here  (note, this sets XML_OVERWRITE)
-                      (unsigned long) ~(XML_PLUGINS | XML_NO_PLUGINS | XML_GENERAL | XML_PASTE_DUPLICATE), 
+                      (unsigned long) ~(XML_PLUGINS | XML_NO_PLUGINS | XML_GENERAL | XML_PASTE_DUPLICATE | XML_IMPORT_MAIN_FILE_ONLY), 
                       0,          // load flags
                       &iTriggers,  
                       &iAliases,   

xml/xml_load_world.cpp

@@ -391,13 +391,13 @@ LONGLONG iCounterFrequency = large_int_frequency.QuadPart;
       m_strCurrentIncludeFileList.AddTail (strFileName);
       }
 
-    if (iMask & XML_NO_PLUGINS)
+    if ((iMask & XML_NO_PLUGINS) && !(iMask & XML_IMPORT_MAIN_FILE_ONLY))
       {
       if (FindNode (*pMuClientElement, "plugin")) 
         ThrowErrorException ("Plugin not expected here. Use File -> Plugins to load plugins");
       }
 
-    if (iMask & XML_PLUGINS)
+    if ((iMask & XML_PLUGINS) && !(iMask & XML_IMPORT_MAIN_FILE_ONLY))
       if (!(iMask & XML_NO_PLUGINS))
         {    // plugin expected now
         Load_Plugin_XML (*pMuClientElement);    // get <plugin> details
@@ -459,7 +459,7 @@ LONGLONG iCounterFrequency = large_int_frequency.QuadPart;
       {
       // we have to do plugins later, so that we know the world ID, amongst other things
       // now load include files that include plugins
-      if (!ar.GetFile ()->GetFilePath ().IsEmpty ())
+      if (!ar.GetFile ()->GetFilePath ().IsEmpty () && !(iMask & XML_IMPORT_MAIN_FILE_ONLY))
         Load_Includes_XML (*pMuClientElement,
                       iMask,
                       iFlags,

xml/xml_serialize.cpp

@@ -47,7 +47,7 @@ void CMUSHclientDoc::Serialize_World_XML (CArchive& ar)
     }
   else
     { // loading
-    Load_World_XML (ar, (unsigned long) ~(XML_PLUGINS | XML_NO_PLUGINS | XML_PASTE_DUPLICATE));    // load all options, except plugins
+    Load_World_XML (ar, (unsigned long) ~(XML_PLUGINS | XML_NO_PLUGINS | XML_PASTE_DUPLICATE | XML_IMPORT_MAIN_FILE_ONLY));    // load all options, except plugins
     m_bLoaded = true;   // this world has been loaded from disk
     }