From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 15 Jun 2019 23:14:40 +0000 (+0200)
Subject: Fix so that parameters directly on effects actually override the ones on the block... 
X-Git-Tag: 1.9.0~28
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=d3f363c0ac414e696844d277b34a79dd414c19e2;hp=2839159e454d18d2536facaf47ad57eff529f303

Fix so that parameters directly on effects actually override the ones on the block, as was intended.
---

diff --git a/nageru/scene.cpp b/nageru/scene.cpp
index 3892738..0eacc75 100644
--- a/nageru/scene.cpp
+++ b/nageru/scene.cpp
@@ -366,16 +366,16 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
 		if (!block->alternatives.empty()) {
 			EffectBlueprint *blueprint = block->alternatives[block->currently_chosen_alternative];
 			for (const auto &key_and_tuple : blueprint->int_parameters) {
-				int_to_set.emplace(make_pair(effect, key_and_tuple.first), key_and_tuple.second);
+				int_to_set[make_pair(effect, key_and_tuple.first)] = key_and_tuple.second;
 			}
 			for (const auto &key_and_tuple : blueprint->float_parameters) {
-				float_to_set.emplace(make_pair(effect, key_and_tuple.first), key_and_tuple.second);
+				float_to_set[make_pair(effect, key_and_tuple.first)] = key_and_tuple.second;
 			}
 			for (const auto &key_and_tuple : blueprint->vec3_parameters) {
-				vec3_to_set.emplace(make_pair(effect, key_and_tuple.first), key_and_tuple.second);
+				vec3_to_set[make_pair(effect, key_and_tuple.first)] = key_and_tuple.second;
 			}
 			for (const auto &key_and_tuple : blueprint->vec4_parameters) {
-				vec4_to_set.emplace(make_pair(effect, key_and_tuple.first), key_and_tuple.second);
+				vec4_to_set[make_pair(effect, key_and_tuple.first)] = key_and_tuple.second;
 			}
 		}
 	}