From d3f363c0ac414e696844d277b34a79dd414c19e2 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 16 Jun 2019 01:14:40 +0200 Subject: [PATCH] Fix so that parameters directly on effects actually override the ones on the block, as was intended. --- nageru/scene.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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; } } } -- 2.39.2