Fix so that parameters directly on effects actually override the ones on the block...

[nageru] / nageru / theme.cpp

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index bf7cdee1e3ceb64f7705f619f1f992c464357b5d..53b7543cee3a9f5fe07b1d9c8dc441633fd5b171 100644 (file)
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -791,7 +791,7 @@ const luaL_Reg Scene_funcs[] = {
 
 const luaL_Reg Block_funcs[] = {
        { "display", Block_display },
-       { "choose_alternative", Block_choose_alternative },
+       { "choose", Block_choose },
        { "enable", Block_enable },
        { "disable", Block_disable },
        { "set_int", Block_set_int },