--- a/QTfrontend/about.cpp	Thu Feb 04 20:49:59 2010 +0000
+++ b/QTfrontend/about.cpp	Thu Feb 04 22:29:19 2010 +0000
@@ -74,7 +74,7 @@
 			"Frontend improvements: Martin Minarik &lt;<a href=\"mailto:ttsmj@pokec.sk\">ttsmj@pokec.sk</a>&gt;<br>"
 			"Frontend improvements: Kristian Lehmann &lt;<a href=\"mailto:email@thexception.net\">email@thexception.net</a>&gt;<br>"
 			"Mac OS X port, OpenAL wrapper library: Vittorio Giovara &lt;<a href=\"mailto:vittorio.giovara@gmail.com\">vittorio.giovara@gmail.com</a>&gt;<br>"
-			"Gamepad support and additional effects: Mario Liebisch &lt;<a href=\"mailto:mario.liebisch+hw@googlemail.com\">mario.liebisch+hw@googlemail.com</a>&gt;"
+			"Gamepad support and additional effects: Mario Liebisch &lt;<a href=\"mailto:mario.liebisch@googlemail.com\">mario.liebisch@googlemail.com</a>&gt;"
 			"</p><h2>" +
 
 			QLabel::tr("Art:") + "</h2>"

--- a/hedgewars/uStore.pas	Thu Feb 04 20:49:59 2010 +0000
+++ b/hedgewars/uStore.pas	Thu Feb 04 22:29:19 2010 +0000
@@ -218,6 +218,12 @@
 
 		DrawRoundRect(@r, cWhiteColor, cNearBlackColor, texsurf, true);
 
+		// overwrite flag for cpu teams and keep players from using it
+		if (Hedgehogs[0].Gear <> nil) and (Hedgehogs[0].BotLevel > 0) then
+			Flag:= 'cpu'
+		else if Flag = 'cpu' then
+			Flag:= 'hedgewars';
+		
 		flagsurf:= LoadImage(Pathz[ptFlags] + '/' + Flag, ifNone);
 		if flagsurf = nil then
 			flagsurf:= LoadImage(Pathz[ptFlags] + '/hedgewars', ifNone);

Binary file share/hedgewars/Data/Graphics/Flags/cm_42.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_anarchy.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_balrog.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_bars.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_binary.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_birdy.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_bloodyblade.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_brittany.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_cog.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_crossedswords.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_dragonrb.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_earth.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_earth2.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_eyeofhorus.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_face.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_fcw.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_female.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_galaxy.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_hax0r.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_hurrah.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_iluvu.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_lips.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_magicskull.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_male.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_mog.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_music.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_pacman.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_pacman2.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_pentagram.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_pirate.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_scout.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_shoppa.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_spider.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_star.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_swordshield.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_swordshield2.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_vampire.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cm_yinyang.png has changed

Binary file share/hedgewars/Data/Graphics/Flags/cpu.png has changed

Binary file share/hedgewars/Data/Graphics/Hats/4gsuif.png has changed

Binary file share/hedgewars/Data/Graphics/Hats/Falcon.png has changed

Binary file share/hedgewars/Data/Graphics/Hats/Jason.png has changed

Binary file share/hedgewars/Data/Graphics/Hats/quotecap.png has changed

--- a/share/hedgewars/Data/Locale/en.txt	Thu Feb 04 20:49:59 2010 +0000
+++ b/share/hedgewars/Data/Locale/en.txt	Thu Feb 04 22:29:19 2010 +0000
@@ -402,7 +402,7 @@
 04:00=Attack your enemies using a simple grenade.|It will explode once its timer reaches zero.|1-5: Set grenade's timer|Attack: Hold to throw with more power
 04:01=Attack your enemies using a cluster bomb.|It will split into smaller bombs once its timer|reaches zero.|1-5: Set grenade's timer|Attack: Hold to throw with more power
 04:02=Attack your enemies using a ballistic projectile|that might be influenced by wind.|Attack: Hold to shoot with more power
-04:03=Launch a guided bomb that while home into|the selected target. Don't shoot with full power|to improve its precision.|Cursor: Pick target|Attack: Hold to shoot with more power
+04:03=Launch a guided bomb that will home in towards|the selected target. Don't shoot with full power|to improve its precision.|Cursor: Pick target|Attack: Hold to shoot with more power
 04:04=Attack your enemy using a shotgun with two shots.|Thanks to its spread you don't need direct hits|to harm your opponents.|Attack: Shoot (multiple times)
 04:05=Move underground! Use the pickhammer to drill|a hole into the ground and reach other areas.|Attack: Start or stop digging
 04:06=Bored? No way to attack? Save your ammo?|No problem! Just skip your turn, coward!|Attack: Skip your turn without fighting
@@ -490,7 +490,7 @@
 04:00=Attack your enemies using a simple grenade.|It will explode once its timer reaches zero.|1-5: Set grenade's timer|Attack: Hold to throw with more power
 04:01=Attack your enemies using a cluster bomb.|It will split into smaller bombs once its timer|reaches zero.|1-5: Set grenade's timer|Attack: Hold to throw with more power
 04:02=Attack your enemies using a ballistic projectile|that might be influenced by wind.|Attack: Hold to shoot with more power
-04:03=Launch a guided bomb that while home into|the selected target. Don't shoot with full power|to improve its precision.|Cursor: Pick target|Attack: Hold to shoot with more power
+04:03=Launch a guided bomb that will lock on the|selected target. Don't shoot with full power|to improve its precision.|Cursor: Pick target|Attack: Hold to shoot with more power
 04:04=Attack your enemy using a shotgun with two shots.|Thanks to its spread you don't need direct hits|to harm your opponents.|Attack: Shoot (multiple times)
 04:05=Move underground! Use the pickhammer to drill|a hole into the ground and reach other areas.|Attack: Start or stop digging
 04:06=Bored? No way to attack? Save your ammo?|No problem! Just skip your turn, coward!|Attack: Skip your turn without fighting