merge
authornemo
Mon, 06 Dec 2010 08:58:24 -0500
changeset 4472 9cf7ec8fdb71
parent 4470 d2b8d2fc51a9 (diff)
parent 4471 220d44cb8659 (current diff)
child 4473 b6487d2c15ad
merge
--- a/hedgewars/uGears.pas	Mon Dec 06 12:21:12 2010 +0300
+++ b/hedgewars/uGears.pas	Mon Dec 06 08:58:24 2010 -0500
@@ -1764,11 +1764,13 @@
     else if x < 4 then text:= copy(s, 3, Length(s) - 1)
     else text:= copy(s, 2, Length(s) - 1);
 
+    (*
     if CheckNoTeamOrHH then
         begin
         ParseCommand('say ' + text, true);
         exit
         end;
+    *)
 
     if (x < 4) and (TeamsArray[t] <> nil) then
         begin
@@ -1799,7 +1801,7 @@
             end
         else ParseCommand('say ' + text, true)
         end
-    else
+    else if (x >= 4) then
         begin
         SpeechType:= x-3;
         SpeechText:= text