X-Git-Url: http://git.tdb.fi/?p=libs%2Fdemoscene.git;a=blobdiff_plain;f=source%2Fsequencer.cpp;h=0297c4397ff254bf30d26d95a44f4ec7909a1122;hp=eeb41d20da6865b72eb0ab0c5097ad1a0805600a;hb=5296c1532980c5918ac91370e7dd670d673edb85;hpb=e34e82619af0704b465e081f257f9952972e04b2

diff --git a/source/sequencer.cpp b/source/sequencer.cpp
index eeb41d2..0297c43 100644
--- a/source/sequencer.cpp
+++ b/source/sequencer.cpp
@@ -159,7 +159,7 @@ void Sequencer::Loader::instant(float beat)
 
 void Sequencer::Loader::segment(float start, float end)
 {
-	SegmentLoader ldr(obj, start, end);
+	SegmentLoader ldr(obj, start, end, demo);
 	load_sub_with(ldr);
 }
 
@@ -169,7 +169,7 @@ Sequencer::ActionDefLoader::ActionDefLoader(Sequencer &s, Demo &d):
 	demo(d)
 {
 	for(const auto &t: obj.action_types)
-		add(t.first, t.second->get_loader_func());
+		add(t.first, t.second->get_def_loader_func());
 }
 
 void Sequencer::ActionDefLoader::finished()
@@ -179,12 +179,15 @@ void Sequencer::ActionDefLoader::finished()
 }
 
 
-Sequencer::SegmentLoader::SegmentLoader(Sequencer &s, float b, float e):
+Sequencer::SegmentLoader::SegmentLoader(Sequencer &s, float b, float e, Demo &d):
 	ObjectLoader<Sequencer>(s),
 	start_beat(b),
-	end_beat(e)
+	end_beat(e),
+	demo(d)
 {
 	add("apply", &SegmentLoader::apply);
+	for(const auto &t: obj.action_types)
+		add(t.first, t.second->get_loader_func());
 }
 
 void Sequencer::SegmentLoader::apply(const string &n)