X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fexman.cc;h=4fff917474993cfc1d5d4657453f82750b8a0f44;hp=eea24a6e438da65ca5be930647a8f1f238c4f757;hb=5c69b226e45df981db338dd859ef1d95e9be8f96;hpb=6ecd4ecfa020964e4250bf9322c1a26ac4073b76

diff --git a/src/exman.cc b/src/exman.cc
index eea24a6..4fff917 100644
--- a/src/exman.cc
+++ b/src/exman.cc
@@ -153,6 +153,8 @@ bool ExhibitManager::remove(Exhibit *ex)
 
 bool ExhibitManager::load(MetaScene *mscn, const char *fname)
 {
+	info_log("ExhibitManager::load(%s)\n", fname);
+
 	struct ts_node *root = ts_load(fname);
 	if(!root || strcmp(root->name, "exhibits") != 0) {
 		ts_free_tree(root);
@@ -243,6 +245,7 @@ bool ExhibitManager::load(MetaScene *mscn, const char *fname)
 			const char *voice = ts_get_attr_str(node, "voiceover");
 			if(desc || voice) {
 				ExData exd;
+				exd.type = EXDATA_INFO;
 
 				if(desc) {
 					char *fixed_desc = new char[strlen(desc) + 1];
@@ -331,6 +334,17 @@ void ExhibitManager::stash_exhibit(Exhibit *ex)
 	}
 }
 
+Exhibit *ExhibitManager::unstash_exhibit()
+{
+	if(stashed.empty()) {
+		return 0;
+	}
+
+	Exhibit *ex = stashed[0];
+	stashed.erase(stashed.begin());
+	return ex;
+}
+
 void ExhibitManager::update(float dt)
 {
 	int num = items.size();