removing deprecated

oxygine/src/DebugActor.cpp

@@ -55,7 +55,7 @@ namespace oxygine
 
         file::mount(&zp);
         resSystem = new Resources;
-        resSystem->loadXML2("system/res.xml", ResourcesLoadOptions().prebuiltFolder("system"));
+        resSystem->loadXML("system/res.xml", ResourcesLoadOptions().prebuiltFolder("system"));
     }
 
     void DebugActor::show()

oxygine/src/res/Resources.cpp

@@ -166,12 +166,8 @@ namespace oxygine
         }
     };
 
-    void Resources::load(const std::string& xmlFile, const ResourcesLoadOptions& opt)
-    {
-        loadXML2(xmlFile, opt);
-    }
 
-    void Resources::loadXML2(const std::string& xmlFile, const ResourcesLoadOptions& opt)
+    void Resources::loadXML(const std::string& xmlFile, const ResourcesLoadOptions& opt)
     {
         _name = xmlFile;
         _loadCounter = opt._loadCompletely ? 1 : 0;
@@ -284,25 +280,7 @@ namespace oxygine
 
         FS_LOG("xml loaded");
     }
-
-    void Resources::loadXML(
-        const std::string& xml_name,
-        LoadResourcesContext* load_context,
-        bool load_completely, bool use_load_counter,
-        const std::string& prebuilt_folder_)
-    {
-        ResourcesLoadOptions opt;
-        opt._loadCompletely = load_completely;
-        opt._useLoadCounter = use_load_counter;
-        opt._prebuilFolder = prebuilt_folder_;
-        loadXML2(xml_name, opt);
-    }
-
-    void Resources::addShortIDS()
-    {
-
-    }
-
+	
     void Resources::collect(resources& r)
     {
 #ifdef __S3E__

oxygine/src/res/Resources.h

@@ -64,30 +64,12 @@ namespace oxygine
 
         Resources();
         ~Resources();
-
-        /**
-        DEPRECATED, USE loadXML2 method
-        Loads resources from xml file.
-        @param xml file path
-        @param used for multi threading loading
-        @param should be each resource loaded completely includes internal heavy data (atlasses/textures/buffers) or load only their definition. Could be overloaded in xml: <your_res_type ... load = "false"/>
-        @param use load counter internally
-        @param use not standard folder with prebuilt resources (atlasses, fonts, etc)
-        */
-        void loadXML(const std::string& file, LoadResourcesContext* load_context = 0,
-                     bool load_completely = true, bool use_load_counter = false,
-                     const std::string& prebuilt_folder = "");
-
-
+		
         /**Loads resources from xml file. Load could be called multiple times for different xml files.
         @param xml file paths
         @param options
         */
-        void loadXML2(const std::string& xmlFile, const ResourcesLoadOptions& opt = ResourcesLoadOptions());
-
-        //use loadXML2, later it will be renamed to loadXML
-        OXYGINE_DEPRECATED
-        void load(const std::string& xmlFile, const ResourcesLoadOptions& opt = ResourcesLoadOptions());
+        void loadXML(const std::string& xmlFile, const ResourcesLoadOptions& opt = ResourcesLoadOptions());
 
         /**Adds Resource*/
         void add(Resource* r, bool accessByShortenID = false);
@@ -131,8 +113,6 @@ namespace oxygine
         /**collects all resources into vector*/
         void collect(resources&);
 
-        void addShortIDS();
-
         resources& _getResources();
 
     protected: