# HG changeset patch
# User nemo
# Date 1313172548 14400
# Node ID 4bb542350a180de2983cbda911e7cc647fd8fce8
# Parent  8694688ccc1c4e5a0d556f491615446303df5c46
extend the workaround. FIXME still applies

diff -r 8694688ccc1c -r 4bb542350a18 hedgewars/uScript.pas
--- a/hedgewars/uScript.pas	Fri Aug 12 13:15:30 2011 -0400
+++ b/hedgewars/uScript.pas	Fri Aug 12 14:09:08 2011 -0400
@@ -1115,7 +1115,7 @@
 
 function lc_addteam(L : Plua_State) : LongInt; Cdecl;
 var np: LongInt;
-    voice: shortstring;
+    color, name, grave, fort, voice, flag: shortstring;
 begin
     np:= lua_gettop(L);
     if (np < 5) or (np > 6) then
@@ -1128,14 +1128,19 @@
 (*
  FIXME FIXME FIXME FIXME
  Something is very wrong here.
- For some reason, if I assign voice after the first ParseCommand, it is empty
+ For some reason, the lua_tostring after the first ParseCommand, are empty.  Is ParseCommand scribbling on stuff?
 *)
+        color:= lua_tostring(L, 1);
+        name := lua_tostring(L, 2);
+        grave:= lua_tostring(L, 3);
+        fort := lua_tostring(L, 4);
         voice:= lua_tostring(L, 5);
-        ParseCommand('addteam x ' + lua_tostring(L, 2) + ' ' + lua_tostring(L, 1), true);
-        ParseCommand('grave ' + lua_tostring(L, 3), true);
-        ParseCommand('fort ' + lua_tostring(L, 4), true);
+        if (np = 6) flag:= lua_tostring(L, 6);
+        ParseCommand('addteam x ' + name + ' ' + color, true);
+        ParseCommand('grave ' + grave, true);
+        ParseCommand('fort ' + fort, true);
         ParseCommand('voicepack ' + voice, true);
-        if (np = 6) then ParseCommand('flag ' + lua_tostring(L, 6), true);
+        if (np = 6) then ParseCommand('flag ' + flag, true);
         CurrentTeam^.Binds:= DefaultBinds
         // fails on x64
         //lua_pushinteger(L, LongInt(CurrentTeam));