# HG changeset patch
# User nemo
# Date 1396116125 14400
# Node ID 05be26df1242ec13dfd3b965031862e25df02fd4
# Parent  bbeb1e9aaa6524ebb23e5e6a2b1b5b489e6e8b4d# Parent  1a6b9a98147ca757c19793c1b13be788fdda1dc8
merge

diff -r bbeb1e9aaa65 -r 05be26df1242 hedgewars/uScript.pas
--- a/hedgewars/uScript.pas	Sat Mar 29 13:57:46 2014 -0400
+++ b/hedgewars/uScript.pas	Sat Mar 29 14:02:05 2014 -0400
@@ -1077,13 +1077,18 @@
             vgear:= AddVisualGear(0, 0, vgtSpeechBubble, s, true);
             if vgear <> nil then
                begin
+               if Gear^.Kind = gtHedgehog then
+                   begin
+                   AddChatString(#1+'[' + gear^.Hedgehog^.Name + '] '+vgear^.text);
+                   vgear^.Hedgehog:= gear^.Hedgehog
+                   end
+               else vgear^.Frame:= gear^.uid;
+
                vgear^.Text:= lua_tostring(L, 2);
-               vgear^.Hedgehog:= gear^.Hedgehog;
                vgear^.FrameTicks:= lua_tointeger(L, 3);
                if (vgear^.FrameTicks < 1) or (vgear^.FrameTicks > 3) then
                    vgear^.FrameTicks:= 1;
                lua_pushinteger(L, vgear^.Uid);
-               AddChatString(#1+'[' + gear^.Hedgehog^.Name + '] '+vgear^.text)
                end
             end
             else