X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=b1b129b757fd6a65139a9cfb00c6a8663e75af17;hb=94ac63c6f41227ce57790d9903039ec18a6ef3fd;hp=2cfe022c1a1d74d5035aa855922dcc7ba9e5f0c8;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 2cfe022..b1b129b 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -18,12 +18,13 @@ Resources::Resources():
 	default_font(0)
 {
 	add_keyword<Graphic>("graphic");
+	add_keyword<GL::Texture2D>("texture");
 
 	add_creator(&Resources::create_font);
 	add_creator(&Resources::create_texture);
 }
 
-void Resources::set_path(const Path &p)
+void Resources::set_path(const FS::Path &p)
 {
 	path=p;
 }
@@ -39,7 +40,7 @@ const GL::Font &Resources::get_default_font() const
 GL::Font *Resources::create_font(const string &name)
 {
 	RefPtr<GL::Font> fnt=new GL::Font;
-	DataFile::load<GL::Font, Resources &>(*fnt, (path/name).str(), *this);
+	DataFile::load(*fnt, (path/name).str(), *this);
 	if(!default_font)
 		default_font=fnt.get();
 	return fnt.release();
@@ -71,7 +72,7 @@ void Resources::Loader::default_font(const string &name)
 void Resources::Loader::font(const string &name)
 {
 	RefPtr<GL::Font> fnt=new GL::Font;
-	load_sub(*fnt);
+	load_sub(*fnt, res);
 	res.add(name, fnt.get());
 	if(!res.default_font)
 		res.default_font=fnt.get();