X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;fp=source%2Fresources.cpp;h=e83c1bb178e5adea2acc6525acfdc01c0b8b87f1;hb=e5f9004b672b038e43cf2b20c3fc9327f2b55ffd;hp=869885fecd97e77ae3719399c8fd53d6690baef7;hpb=d88af5a7898020e4493fef8ec0cb9e88666b66df;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 869885f..e83c1bb 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -24,11 +24,9 @@ Resources::Resources(const FS::Path &fn):
 
 void Resources::init()
 {
-	add_keyword<Graphic>("graphic");
-	add_keyword<GL::Texture2D>("texture");
-
-	add_creator(&Resources::create_font);
-	add_creator(&Resources::create_texture);
+	add_type<Graphic>().keyword("graphic");
+	add_type<GL::Texture2D>().keyword("texture").creator(&Resources::create_texture);
+	add_type<GL::Font>().creator(&Resources::create_font);
 }
 
 void Resources::set_path(const FS::Path &p)
@@ -75,7 +73,7 @@ Resources::Loader::Loader(Resources &r):
 
 void Resources::Loader::default_font(const string &name)
 {
-	res.default_font = res.get<GL::Font>(name);
+	res.default_font = &res.get<GL::Font>(name);
 }
 
 void Resources::Loader::font(const string &name)