Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed error message
authorXeli
Sun, 15 Jan 2012 21:08:15 +0100
changeset 6568 ad83229a7d98
parent 6563 30e042398411 (diff)
parent 6567 54e19cefcdac (current diff)
child 6569 64f9fbd48b9e
changed error message
project_files/Android-build/SDL-android-project/res/values/strings.xml file | annotate | diff | comparison | revisions 
--- a/hedgewars/uScript.pas	Sun Jan 15 21:07:52 2012 +0100
+++ b/hedgewars/uScript.pas	Sun Jan 15 21:08:15 2012 +0100
@@ -1881,7 +1881,7 @@
 end;
 
 procedure ScriptApplyAmmoStore;
-var i, j : LongInt;
+var i, j, k : LongInt;
 begin
 SetAmmoLoadout(ScriptAmmoLoadout);
 SetAmmoProbability(ScriptAmmoProbability);
@@ -1890,14 +1890,26 @@
 
 if (GameFlags and gfSharedAmmo) <> 0 then
     for i:= 0 to Pred(ClansCount) do
-        AddAmmoStore
+        begin
+        AddAmmoStore;
+        for j:= 0 to Pred(ClansArray[i]^.TeamsNumber) do
+            for k:= 0 to Pred(ClansArray[i]^.Teams[j]^.HedgehogsNumber) do
+                ClansArray[i]^.Teams[j]^.Hedgehogs[k].AmmoStore:= StoreCnt - 1
+        end
 else if (GameFlags and gfPerHogAmmo) <> 0 then
     for i:= 0 to Pred(TeamsCount) do
         for j:= 0 to Pred(TeamsArray[i]^.HedgehogsNumber) do
-            AddAmmoStore
+            begin
+            AddAmmoStore;
+            TeamsArray[i]^.Hedgehogs[j].AmmoStore:= StoreCnt - 1
+            end
 else 
     for i:= 0 to Pred(TeamsCount) do
-        AddAmmoStore
+        begin
+        AddAmmoStore;
+        for j:= 0 to Pred(TeamsArray[i]^.HedgehogsNumber) do
+            TeamsArray[i]^.Hedgehogs[j].AmmoStore:= StoreCnt - 1
+        end
 end;
 
 procedure initModule;
--- a/project_files/Android-build/SDL-android-project/res/values/strings.xml	Sun Jan 15 21:07:52 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/values/strings.xml	Sun Jan 15 21:08:15 2012 +0100
@@ -21,7 +21,7 @@
     <string name="download_done">Done</string>
     <string name="download_back">Back to main menu</string>
     <string name="download_tryagain">Try again</string>
-    <string name="download_failed">The download has failed, check the internet connectivity and please try again</string>
+    <string name="download_failed">The download has failed because of: </string>
     <string name="download_userexplain">Before starting the game we must download some extra files...</string>
     
     <string name="download_areyousure">Are you sure you want to download this package?</string>
hedgewars