X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdataset.inl;h=ca01ea2d3336d450e74f7e960bc749e9ebb464b6;hb=2c648dbdf80ad77015e3283beb028cd389c2d2fa;hp=5f0fbf96e266deb09cd242455734204e157ad25a;hpb=ccc1a688b59e25bb934a0d3e2bbf477960068d4f;p=laserbrain_demo

diff --git a/src/dataset.inl b/src/dataset.inl
index 5f0fbf9..ca01ea2 100644
--- a/src/dataset.inl
+++ b/src/dataset.inl
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include "logger.h"
 
 template <typename T>
 DataSet<T>::DataSet(T (*create_func)(), bool (*load_func)(T, const char*), bool (*done_func)(T), void (*destr_func)(T))
@@ -45,6 +46,7 @@ T DataSet<T>::get(const char *name) const
 	}
 
 	T res = create();
+	data[name] = res;
 	resman_lookup(rman, name, res);
 	return res;
 }
@@ -57,6 +59,7 @@ int DataSet<T>::dataset_load_func(const char *fname, int id, void *cls)
 {
 	DataSet<T> *dset = (DataSet<T>*)cls;
 	T data = (T)resman_get_res_data(dset->rman, id);
+	if(!data) return -1;
 
 	if(!dset->load(data, fname)) {
 		return -1;
@@ -73,9 +76,9 @@ int DataSet<T>::dataset_done_func(int id, void *cls)
 	int load_res = resman_get_res_result(dset->rman, id);
 
 	if(load_res != 0) {
-		fprintf(stderr, "failed to load resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
+		error_log("failed to load resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
 	} else {
-		printf("done loading resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
+		info_log("done loading resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
 	}
 
 	if(dset->done) {