Make the default constructor of Resources protected

[libs/demoscene.git] / source / resources.cpp

diff --git a/source/resources.cpp b/source/resources.cpp
index f44d8c1985d05ef1e45c3651bcaa0a8b77cb4d1f..c70e0a11308aee38929e053983bfa285ab51c04c 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -12,16 +12,17 @@ void init_data(DataFile::BuiltinSource &);
 
 Resources::Resources()
 {
-       add_source(get_builtin_source());
+       init();
 }
 
-Resources::Resources(const string &pack_name):
-       ui_font(0),
-       ui_text_technique(0)
+Resources::Resources(const string &pack_name)
 {
-       set_default_texture_anisotropy(8);
-       set_srgb_conversion(true);
+       init();
+       init_sources(pack_name);
+}
 
+void Resources::init_sources(const string &pack_name)
+{
        FS::Path data_dir = "data";
        if(FS::exists(data_dir))
        {
@@ -35,6 +36,15 @@ Resources::Resources(const string &pack_name):
                pack_source.add_pack_file(pack_name);
                add_source(pack_source);
        }
+}
+
+void Resources::init()
+{
+       ui_font = 0;
+       ui_text_technique = 0;
+
+       set_default_texture_anisotropy(8);
+       set_srgb_conversion(true);
 
        add_source(get_builtin_source());
 }