Engine:
authorsmxx
Mon, 01 Mar 2010 18:01:09 +0000
changeset 2903 e28356fe532a
parent 2902 1566f05ca371
child 2904 209a0c573917
Engine: * Added game mode notice for shared ammo game flag
hedgewars/uConsts.pas
hedgewars/uLocale.pas
hedgewars/uWorld.pas
share/hedgewars/Data/Locale/de.txt
share/hedgewars/Data/Locale/en.txt
--- a/hedgewars/uConsts.pas	Mon Mar 01 17:54:12 2010 +0000
+++ b/hedgewars/uConsts.pas	Mon Mar 01 18:01:09 2010 +0000
@@ -308,6 +308,9 @@
 	gfPlaceHog       = $00008000;
 	gfSharedAmmo     = $00010000;
 	gfDisableGirders = $00020000;
+	// NOTE: When adding new game flags, ask yourself
+	// if a "game start notice" would be useful. If so,
+	// add one in uWorld.pas - look for "AddGoal".
 
 	gstDrowning       = $00000001;
 	gstHHDriven       = $00000002;
--- a/hedgewars/uLocale.pas	Mon Mar 01 17:54:12 2010 +0000
+++ b/hedgewars/uLocale.pas	Mon Mar 01 18:01:09 2010 +0000
@@ -38,7 +38,9 @@
 			eidNewHealthPack, eidNewAmmoPack, eidNewUtilityPack, eidTurnSkipped, eidHurtSelf,
 			eidHomerun, eidFrozen);
 
-	TGoalStrId = (gidCaption, gidSubCaption, gidForts, gidLowGravity, gidInvulnerable, gidVampiric, gidKarma, gidKing, gidPlaceHog, gidArtillery, gidSolidLand);
+	TGoalStrId = (gidCaption, gidSubCaption, gidForts, gidLowGravity, gidInvulnerable,
+			gidVampiric, gidKarma, gidKing, gidPlaceHog, gidArtillery,
+			gidSolidLand, gidSharedAmmo);
 
 const MAX_EVENT_STRINGS = 100;
 var trammo: array[TAmmoStrId] of string;
--- a/hedgewars/uWorld.pas	Mon Mar 01 17:54:12 2010 +0000
+++ b/hedgewars/uWorld.pas	Mon Mar 01 18:01:09 2010 +0000
@@ -116,6 +116,7 @@
 g:= AddGoal(g, gfPlaceHog, gidPlaceHog); // placement?
 g:= AddGoal(g, gfArtillery, gidArtillery); // artillery?
 g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land?
+g:= AddGoal(g, gfSharedAmmo, gidSharedAmmo); // shared ammo?
 // if the string has been set, show it for (default timeframe) seconds
 if g <> '' then ShowMission(trgoal[gidCaption], trgoal[gidSubCaption], g, 1, 0);
 
--- a/share/hedgewars/Data/Locale/de.txt	Mon Mar 01 17:54:12 2010 +0000
+++ b/share/hedgewars/Data/Locale/de.txt	Mon Mar 01 18:01:09 2010 +0000
@@ -257,3 +257,4 @@
 05:08=Igel platzieren: Wähle vor dem Spielstart die Positionen deiner Igel
 05:09=Artillerie: Deine Igel können nicht laufen
 05:10=Unzerstörbares Terrain: Explosionen zerstören den Boden nicht
+05:11=Gemeinsames Arsenal: Alle Teams gleicher Farbe teilen sich ihr Arsenal
--- a/share/hedgewars/Data/Locale/en.txt	Mon Mar 01 17:54:12 2010 +0000
+++ b/share/hedgewars/Data/Locale/en.txt	Mon Mar 01 18:01:09 2010 +0000
@@ -458,4 +458,5 @@
 05:07=Protect the King: Don't let your king die!|Place the King: Pick a protected starting point for your King
 05:08=Place Hedgehogs: Place your hogs before the game starts
 05:09=Artillery: Hogs can't walk to change position
-05:10=Indestructible Terrain: Most weapons won't destroy terrain
\ No newline at end of file
+05:10=Indestructible Terrain: Most weapons won't destroy terrain
+05:11=Shared Ammo: All teams of the same color share their ammunition