Fix animation_image support in scroll containers

diff --git a/games/devtest/mods/testformspec/formspec.lua b/games/devtest/mods/testformspec/formspec.lua
index bb178e1b333afb47b75b80c1167fff215cac7116..2a2bdad60995514910a68c768b5e3b7d3c42abb6 100644 (file)
--- a/games/devtest/mods/testformspec/formspec.lua
+++ b/games/devtest/mods/testformspec/formspec.lua
@@ -227,6 +227,7 @@ local scroll_fs =
        "box[1,1;8,6;#00aa]"..
        "scroll_container[1,1;8,6;scrbar;vertical]"..
                "button[0,1;1,1;lorem;Lorem]"..
+               "animated_image[0,1;4.5,1;clip_animated_image;testformspec_animation.png;4;100]" ..
                "button[0,10;1,1;ipsum;Ipsum]"..
                "pwdfield[2,2;1,1;lorem2;Lorem]"..
                "list[current_player;main;4,4;1,5;]"..

diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index 88ea778124f46fd2a71025debcae840f68f4b691..5aa6dc9ae668c7e4fe0f911c4321e06481ea26f3 100644 (file)
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -928,7 +928,7 @@ void GUIFormSpecMenu::parseAnimatedImage(parserData *data, const std::string &el
 
        core::rect<s32> rect = core::rect<s32>(pos, pos + geom);
 
-       GUIAnimatedImage *e = new GUIAnimatedImage(Environment, this, spec.fid,
+       GUIAnimatedImage *e = new GUIAnimatedImage(Environment, data->current_parent, spec.fid,
                rect, texture_name, frame_count, frame_duration, m_tsrc);
 
        if (parts.size() >= 7)