# HG changeset patch
# User unc0rr
# Date 1222617307 0
# Node ID 5943efa67299f201c6ce42d245c9b324c5ad53ab
# Parent  a63a13eda583bf0e6f4fca2f555750069a27cf11
Predefined team can have customized hat

diff -r a63a13eda583 -r 5943efa67299 QTfrontend/predefteams.h
--- a/QTfrontend/predefteams.h	Sun Sep 28 15:45:37 2008 +0000
+++ b/QTfrontend/predefteams.h	Sun Sep 28 15:55:07 2008 +0000
@@ -34,6 +34,14 @@
 	const char * hh5name;
 	const char * hh6name;
 	const char * hh7name;
+	const char * hh0hat;
+	const char * hh1hat;
+	const char * hh2hat;
+	const char * hh3hat;
+	const char * hh4hat;
+	const char * hh5hat;
+	const char * hh6hat;
+	const char * hh7hat;
 	QString Grave;
 	QString Fort;
 };
@@ -51,6 +59,14 @@
 		QT_TRANSLATE_NOOP("teams", "hedgehog 6"),
 		QT_TRANSLATE_NOOP("teams", "hedgehog 7"),
 		QT_TRANSLATE_NOOP("teams", "hedgehog 8"),
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
 		"Simple", "Island"
 	},
 	{
@@ -63,6 +79,14 @@
 		QT_TRANSLATE_NOOP("teams", "Demeter"),
 		QT_TRANSLATE_NOOP("teams", "Kali"),
 		QT_TRANSLATE_NOOP("teams", "Inanna"),
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
 		"Bone", "Island"
 	},
 	{
@@ -75,6 +99,14 @@
 		QT_TRANSLATE_NOOP("teams", "Mango"),
 		QT_TRANSLATE_NOOP("teams", "Peach"),
 		QT_TRANSLATE_NOOP("teams", "Plum"),
+		"banana",
+		"apple",
+		"orange",
+		"lemon",
+		"NoHat",
+		"NoHat",
+		"NoHat",
+		"NoHat",
 		"coffin", "Barrelhouse"
 	}
 };
diff -r a63a13eda583 -r 5943efa67299 QTfrontend/team.cpp
--- a/QTfrontend/team.cpp	Sun Sep 28 15:45:37 2008 +0000
+++ b/QTfrontend/team.cpp	Sun Sep 28 15:55:07 2008 +0000
@@ -81,6 +81,15 @@
 	HHName[5] = QApplication::translate("teams", pteams[num].hh5name);
 	HHName[6] = QApplication::translate("teams", pteams[num].hh6name);
 	HHName[7] = QApplication::translate("teams", pteams[num].hh7name);
+	HHHat[0] = pteams[num].hh0hat;
+	HHHat[1] = pteams[num].hh1hat;
+	HHHat[2] = pteams[num].hh2hat;
+	HHHat[3] = pteams[num].hh3hat;
+	HHHat[4] = pteams[num].hh4hat;
+	HHHat[5] = pteams[num].hh5hat;
+	HHHat[6] = pteams[num].hh6hat;
+	HHHat[7] = pteams[num].hh7hat;
+	
 	Grave = pteams[num].Grave;
 	Fort = pteams[num].Fort;
 	for(int i = 0; i < BINDS_NUMBER; i++)
diff -r a63a13eda583 -r 5943efa67299 hedgewars/uAIAmmoTests.pas
--- a/hedgewars/uAIAmmoTests.pas	Sun Sep 28 15:45:37 2008 +0000
+++ b/hedgewars/uAIAmmoTests.pas	Sun Sep 28 15:55:07 2008 +0000
@@ -365,7 +365,7 @@
 or (Abs(hwRound(Me^.Y) - 50 - Targ.Y) > 50) then
 	begin
 	if TestColl(hwRound(Me^.Y), hwRound(Me^.Y) - 16, 6) then
-		Result:= 1
+		Result:= Succ(BadTurn)
 	else
 		Result:= BadTurn;
 	exit(Result)