hedgewars/uFLGameConfig.pas
branchqmlfrontend
changeset 10450 bf9e30b4ef9b
parent 10448 4cb727e029fa
child 10452 03519fd9f98d
--- a/hedgewars/uFLGameConfig.pas	Sat Nov 01 00:23:22 2014 +0300
+++ b/hedgewars/uFLGameConfig.pas	Sat Nov 01 22:51:07 2014 +0300
@@ -97,7 +97,13 @@
 end;
 
 procedure resetGameConfig; cdecl;
+var i: Longword;
 begin
+    with currentConfig do
+    begin
+        for i:= 0 to 7 do
+            teams[i].hogsNumber:= 0
+    end
 end;
 
 procedure setSeed(seed: PChar); cdecl;
@@ -111,7 +117,7 @@
     getSeed:= str2PChar(currentConfig.seed)
 end;
 
-function getUnusedColor: shortstring;
+function getUnusedColor: Longword;
 var i, c: Longword;
     fColorMatched: boolean;
 begin
@@ -119,7 +125,7 @@
     i:= 0;
     repeat
         repeat
-            fColorMatched:= (currentConfig.teams[i].hogsNumber > 0) and (currentConfig.teams[i].color = colorsSet[c]);
+            fColorMatched:= (currentConfig.teams[i].hogsNumber > 0) and (currentConfig.teams[i].color = c);
             inc(i)
         until (i >= 8) or (currentConfig.teams[i].hogsNumber = 0) or fColorMatched;
 
@@ -130,7 +136,7 @@
         end;
     until not fColorMatched;
 
-    getUnusedColor:= colorsSet[c]
+    getUnusedColor:= c
 end;
 
 procedure runQuickGame; cdecl;
@@ -144,9 +150,9 @@
         argumentsNumber:= 3;
 
         teams[0]:= createRandomTeam;
-        teams[0].color:= colorsSet[0];
+        teams[0].color:= 0;
         teams[1]:= createRandomTeam;
-        teams[1].color:= colorsSet[1];
+        teams[1].color:= 1;
         teams[1].botLevel:= 1;
 
         queueExecution;
@@ -201,7 +207,7 @@
 var msg: ansistring;
     i, hn, hedgehogsNumber: Longword;
     team: PTeam;
-    c: shortstring;
+    c: Longword;
 begin
     with currentConfig do
     begin