openal fix, training map selection and rcplane adjustments from Smaxx (untested, but look reasonable). Bunch of new graphics from Tiy, new translation for pt-pt from inu_
authornemo
Thu, 15 Oct 2009 21:47:05 +0000
changeset 2468 0b62498c201a
parent 2467 be6690c337fb
child 2469 135b11674ac1
openal fix, training map selection and rcplane adjustments from Smaxx (untested, but look reasonable). Bunch of new graphics from Tiy, new translation for pt-pt from inu_
QTfrontend/game.cpp
QTfrontend/game.h
QTfrontend/hwform.cpp
QTfrontend/pages.cpp
QTfrontend/pages.h
hedgewars/GSHandlers.inc
hedgewars/uConsts.pas
hedgewars/uGears.pas
openalbridge/ssound.c
share/hedgewars/Data/Graphics/AmmoMenu/Ammos.png
share/hedgewars/Data/Graphics/AmmoMenu/Ammos_bw.png
share/hedgewars/Data/Graphics/Graves/octopus.png
share/hedgewars/Data/Graphics/Hedgehog/amMolotov.png
share/hedgewars/Data/Graphics/Molotov.png
share/hedgewars/Data/Locale/pt-pt.txt
share/hedgewars/Data/Maps/Islands/CMakeLists.txt
share/hedgewars/Data/Maps/Islands/map.cfg
share/hedgewars/Data/Maps/Islands/map.png
share/hedgewars/Data/Maps/Islands/preview.png
share/hedgewars/Data/Themes/Bamboo/CMakeLists.txt
share/hedgewars/Data/Themes/Bamboo/SkyL.png
share/hedgewars/Data/Themes/Bamboo/SkyR.png
share/hedgewars/Data/Themes/Bath/CMakeLists.txt
share/hedgewars/Data/Themes/Bath/HorizontL.png
share/hedgewars/Data/Themes/Bath/HorizontR.png
share/hedgewars/Data/Themes/Blox/CMakeLists.txt
share/hedgewars/Data/Themes/Cake/CMakeLists.txt
share/hedgewars/Data/Themes/Castle/CMakeLists.txt
share/hedgewars/Data/Themes/Castle/SkyL.png
share/hedgewars/Data/Themes/Castle/SkyR.png
share/hedgewars/Data/Themes/City/CMakeLists.txt
share/hedgewars/Data/Themes/Compost/BlueWater.png
share/hedgewars/Data/Themes/Compost/Border.png
share/hedgewars/Data/Themes/Compost/CMakeLists.txt
share/hedgewars/Data/Themes/Compost/Carrot1.png
share/hedgewars/Data/Themes/Compost/Carrot2.png
share/hedgewars/Data/Themes/Compost/Carrot3.png
share/hedgewars/Data/Themes/Compost/Carrot4.png
share/hedgewars/Data/Themes/Compost/Clouds.png
share/hedgewars/Data/Themes/Compost/Cucumber1.png
share/hedgewars/Data/Themes/Compost/Cucumber2.png
share/hedgewars/Data/Themes/Compost/Cucumber3.png
share/hedgewars/Data/Themes/Compost/Cucumber4.png
share/hedgewars/Data/Themes/Compost/Eggshell1.png
share/hedgewars/Data/Themes/Compost/Eggshell2.png
share/hedgewars/Data/Themes/Compost/Flake.png
share/hedgewars/Data/Themes/Compost/Girder.png
share/hedgewars/Data/Themes/Compost/LandTex.png
share/hedgewars/Data/Themes/Compost/Onion1.png
share/hedgewars/Data/Themes/Compost/Onion2.png
share/hedgewars/Data/Themes/Compost/Sky.png
share/hedgewars/Data/Themes/Compost/horizont.png
share/hedgewars/Data/Themes/Compost/icon.png
share/hedgewars/Data/Themes/Compost/theme.cfg
share/hedgewars/Data/Themes/CrazyMission/CMakeLists.txt
share/hedgewars/Data/Themes/CrazyMission/SkyL.png
share/hedgewars/Data/Themes/CrazyMission/SkyR.png
share/hedgewars/Data/Themes/EarthRise/CMakeLists.txt
share/hedgewars/Data/Themes/EarthRise/HorizontL.png
share/hedgewars/Data/Themes/EarthRise/HorizontR.png
share/hedgewars/Data/Themes/EarthRise/SkyL.png
share/hedgewars/Data/Themes/EarthRise/SkyR.png
share/hedgewars/Data/Themes/Eyes/CMakeLists.txt
share/hedgewars/Data/Themes/Freeway/CMakeLists.txt
share/hedgewars/Data/Themes/Halloween/CMakeLists.txt
share/hedgewars/Data/Themes/Halloween/SkyL.png
share/hedgewars/Data/Themes/Halloween/SkyR.png
share/hedgewars/Data/Themes/Island/CMakeLists.txt
share/hedgewars/Data/Themes/Planes/CMakeLists.txt
share/hedgewars/Data/Themes/Sheep/CMakeLists.txt
share/hedgewars/Data/Themes/Snow/CMakeLists.txt
share/hedgewars/Data/Themes/Underwater/CMakeLists.txt
share/hedgewars/Data/Themes/cheese/CMakeLists.txt
share/hedgewars/Data/Themes/deepspace/BlueWater.png
share/hedgewars/Data/Themes/deepspace/Border.png
share/hedgewars/Data/Themes/deepspace/CMakeLists.txt
share/hedgewars/Data/Themes/deepspace/Clouds.png
share/hedgewars/Data/Themes/deepspace/Flake.png
share/hedgewars/Data/Themes/deepspace/Sky.png
share/hedgewars/Data/Themes/deepspace/horizont.png
share/hedgewars/Data/Themes/deepspace/theme.cfg
share/hedgewars/Data/Themes/hell/CMakeLists.txt
share/hedgewars/Data/Themes/nature/CMakeLists.txt
share/hedgewars/Data/Trainings/001_Shotgun.txt
share/hedgewars/Data/Trainings/002_Bazooka.txt
share/hedgewars/Data/Trainings/003_RCPlane.txt
--- a/QTfrontend/game.cpp	Thu Oct 15 19:38:18 2009 +0000
+++ b/QTfrontend/game.cpp	Thu Oct 15 21:47:05 2009 +0000
@@ -30,6 +30,8 @@
 
 #include <QTextStream>
 
+QString training; // TODO: Cleaner solution?
+
 HWGame::HWGame(GameUIConfig * config, GameCFGWidget * gamecfg, QString ammo, TeamSelWidget* pTeamSelWidget) :
   TCPBase(true),
   ammostr(ammo),
@@ -141,7 +143,7 @@
 	HWProto::addStringListToBuffer(traincfg,
 			team1.TeamGameConfig(100));
 
-	QFile file(datadir->absolutePath() + "/Trainings/003_RCPlane.txt");
+	QFile file(datadir->absolutePath() + "/Trainings/" + training + ".txt");
 	if(!file.open(QFile::ReadOnly))
 	{
 		emit ErrorMessage(tr("Error reading training config file"));
@@ -350,9 +352,10 @@
 	SetGameState(gsStarted);
 }
 
-void HWGame::StartTraining()
+void HWGame::StartTraining(const QString & file)
 {
 	gameType = gtTraining;
+	training = file;
 	demo.clear();
 	Start();
 	SetGameState(gsStarted);
--- a/QTfrontend/game.h	Thu Oct 15 19:38:18 2009 +0000
+++ b/QTfrontend/game.h	Thu Oct 15 21:47:05 2009 +0000
@@ -50,7 +50,7 @@
 	void StartLocal();
 	void StartQuick();
 	void StartNet();
-	void StartTraining();
+	void StartTraining(const QString & file);
 
  protected:
 	virtual QStringList setArguments();
--- a/QTfrontend/hwform.cpp	Thu Oct 15 19:38:18 2009 +0000
+++ b/QTfrontend/hwform.cpp	Thu Oct 15 21:47:05 2009 +0000
@@ -864,7 +864,7 @@
 {
 	CreateGame(0, 0, 0);
 
-	game->StartTraining();
+	game->StartTraining(ui.pageTraining->CBSelect->currentText());
 }
 
 void HWForm::CreateNetGame()
--- a/QTfrontend/pages.cpp	Thu Oct 15 19:38:18 2009 +0000
+++ b/QTfrontend/pages.cpp	Thu Oct 15 21:47:05 2009 +0000
@@ -743,6 +743,16 @@
 	pageLayout->setColumnStretch(1, 2);
 	pageLayout->setColumnStretch(2, 1);
 
+	CBSelect = new QComboBox(this);
+
+	QDir tmpdir;
+	tmpdir.cd(datadir->absolutePath());
+	tmpdir.cd("Trainings");
+	tmpdir.setFilter(QDir::Files);
+	CBSelect->addItems(tmpdir.entryList(QStringList("*.txt")).replaceInStrings(QRegExp("^(.*)\\.txt"), "\\1"));
+
+	pageLayout->addWidget(CBSelect, 1, 1);
+	
 	BtnStartTrain = new QPushButton(this);
 	BtnStartTrain->setFont(*font14);
 	BtnStartTrain->setText(QPushButton::tr("Go!"));
--- a/QTfrontend/pages.h	Thu Oct 15 19:38:18 2009 +0000
+++ b/QTfrontend/pages.h	Thu Oct 15 21:47:05 2009 +0000
@@ -338,6 +338,7 @@
 
 	QPushButton *BtnStartTrain;
 	QPushButton *BtnBack;
+	QComboBox   *CBSelect;
 };
 
 class PageSelectWeapon : public AbstractPage
--- a/hedgewars/GSHandlers.inc	Thu Oct 15 19:38:18 2009 +0000
+++ b/hedgewars/GSHandlers.inc	Thu Oct 15 21:47:05 2009 +0000
@@ -228,10 +228,16 @@
 	if (Gear^.State and gstCollision) <> 0 then begin
 		doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 5, EXPLAutoSound);
 		for i:= 0 to 40 do begin
-			dX:= AngleCos(i * 16) * _0_5 * (GetRandom + _1);
-			dY:= AngleSin(i * 16) * _0_5 * (GetRandom + _1);
-			Fire:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, dY, 0);
-			Fire^.State:= Fire^.State or gsttmpFlag;
+				dX:= AngleCos(i * 2) * ((_0_08*(i mod 10))) * (GetRandom + _1);
+				dY:= AngleSin(i * 8) * _0_5 * (GetRandom + _1);
+				Fire:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, dY, 0);
+				Fire^.State:= Fire^.State or gsttmpFlag;
+				Fire:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, -dY, 0);
+				Fire^.State:= Fire^.State or gsttmpFlag;
+				Fire:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, -dX, dY, 0);
+				Fire^.State:= Fire^.State or gsttmpFlag;
+				Fire:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, -dX, -dY, 0);
+				Fire^.State:= Fire^.State or gsttmpFlag;
 		end;
 		DeleteGear(Gear);
 		exit
@@ -1215,19 +1221,28 @@
 if (Gear^.Tag = 0) and (Gear^.Timer < 1000) then
 	inc(Gear^.Timer)
 else if Gear^.Tag = 1 then
-	if Gear^.Timer > 0 then
-		dec(Gear^.Timer)
-	else
-		begin
-			TrainingTargetGear:= AddGear(0, 0, gtTarget, 0, _0, _0, 0);
-			FindPlace(TrainingTargetGear, false, 0, LAND_WIDTH);
+	begin
+		Gear^.Tag:= 2;
+		if (TrainingFlags and tfTimeTrial) <> 0 then
+			begin
 			inc(TurnTimeLeft, TrainingTimeInc);
 			
 			if TrainingTimeInc > TrainingTimeInM then
 				dec(TrainingTimeInc, TrainingTimeInD);
 			if TurnTimeLeft > TrainingTimeMax then
 				TurnTimeLeft:= TrainingTimeMax;
-			
+			end;
+	end
+else if Gear^.Tag = 2 then
+	if Gear^.Timer > 0 then
+		dec(Gear^.Timer)
+	else
+		begin
+			if (TrainingFlags and tfTargetRespawn) <> 0 then
+				begin
+				TrainingTargetGear:= AddGear(0, 0, gtTarget, 0, _0, _0, 0);
+				FindPlace(TrainingTargetGear, false, 0, LAND_WIDTH);
+				end;
 			DeleteGear(Gear);
 			exit;
 		end;
@@ -1291,10 +1306,11 @@
 	begin
 	if hwAbs(Gear^.dX) > _0_01 then
 		Gear^.dX:= Gear^.dX * _0_995;
-
+	 if (Gear^.State and gsttmpFlag) <> 0 then Gear^.dY:= Gear^.dY + _2*cGravity else
 	Gear^.dY:= Gear^.dY + cGravity;
 	if hwAbs(Gear^.dY) > _0_2 then Gear^.dY:= Gear^.dY * _0_995;
 
+	if (Gear^.State and gsttmpFlag) <> 0 then Gear^.X:= Gear^.X + Gear^.dX else
 	Gear^.X:= Gear^.X + Gear^.dX + cWindSpeed * 640;
 	Gear^.Y:= Gear^.Y + Gear^.dY;
 
@@ -2252,7 +2268,7 @@
 	t:= CheckGearNear(Gear, gtTarget, 36, 36);
 	if t <> nil then
 		begin
-		if t^.Tag = 1 then // collect it only once
+		if t^.Tag <> 0 then // collect it only once
 			exit;
 		PlaySound(sndShotgunReload, false, nil);
 		t^.Tag:= 1;
@@ -2262,33 +2278,11 @@
 
 	if (TurnTimeLeft > 0) then 
 		dec(TurnTimeLeft)
-	else
-		begin
-		if ((TrainingFlags and tfTimeTrial) <>0) and (TimeTrialStopTime = 0) then TimeTrialStopTime:= RealTicks;
-		StopSound(sndRCPlane);
-		ResumeMusic;
-		doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 25, EXPLAutoSound);
-		for i:= 0 to 32 do
-			begin
-			dX:= AngleCos(i * 64) * _0_5 * (GetRandom + _1);
-			dY:= AngleSin(i * 64) * _0_5 * (GetRandom + _1);
-			AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, dY, 0);
-			AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, -dY, 0);
-			end;
-		DeleteGear(Gear);
-		AfterAttack;
-		TurnTimeLeft:= 0;
-		CurAmmoGear:= nil;
-		HHGear^.Message:= 0;
-		ParseCommand('/taunt '#1, true);
-		exit;
-		end;
-
 	end;
 		
 CheckCollision(Gear);
 
-if ((Gear^.State and gstCollision) <> 0)
+if ((Gear^.State and gstCollision) <> 0) or (((TrainingFlags and tfRCPlane) <> 0) and (TurnTimeLeft = 0))
 	or CheckGearDrowning(Gear) then
 	begin
 	if ((TrainingFlags and tfRCPlane) <> 0) and ((TrainingFlags and tfTimeTrial) <> 0 ) and (TimeTrialStopTime = 0) then TimeTrialStopTime:= RealTicks;
@@ -2296,7 +2290,7 @@
 	StopSound(sndRideOfTheValkyries);
 	ResumeMusic;
 
-	if ((Gear^.State and gstCollision) <> 0) then
+	if ((Gear^.State and gstCollision) <> 0) or (((TrainingFlags and tfRCPlane) <> 0) and (TurnTimeLeft = 0)) then
 		begin
 		doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 25, EXPLAutoSound);
 		for i:= 0 to 32 do
@@ -2312,6 +2306,10 @@
 	AfterAttack;
 	CurAmmoGear:= nil;
 	TurnTimeLeft:= 14 * 125;
+	
+	if (TrainingFlags and tfRCPlane) <> 0 then
+		TurnTimeLeft:= 0; // HACK: RCPlane training allows unlimited plane starts in last 2 seconds
+
 	HHGear^.Message:= 0;
 	ParseCommand('/taunt '#1, true)
 	end
--- a/hedgewars/uConsts.pas	Thu Oct 15 19:38:18 2009 +0000
+++ b/hedgewars/uConsts.pas	Thu Oct 15 21:47:05 2009 +0000
@@ -246,11 +246,12 @@
 	cSendEmptyPacketTime = 1000;
 
 	// Training Flags
-	tfNone         = $00000000;
-	tfTimeTrial    = $00000001;
-	tfRCPlane      = $00000002;
-	tfSpawnTargets = $00000004;
-	tfIgnoreDelays = $00000008;
+	tfNone          = $00000000;
+	tfTimeTrial     = $00000001;
+	tfRCPlane       = $00000002;
+	tfSpawnTargets  = $00000004;
+	tfIgnoreDelays  = $00000008;
+	tfTargetRespawn = $00000010;
 	
 	gfForts        = $00000001;
 	gfMultiWeapon  = $00000002;
--- a/hedgewars/uGears.pas	Thu Oct 15 19:38:18 2009 +0000
+++ b/hedgewars/uGears.pas	Thu Oct 15 21:47:05 2009 +0000
@@ -621,6 +621,9 @@
 	stNTurn: begin
 			if isInMultiShoot then isInMultiShoot:= false
 			else begin
+			// delayed till after 0.9.12
+			// reset to default zoom
+			//ZoomValue:= ZoomDefault;
 			ResetUtilities;
 
 			FreeActionsList; // could send -left, -right and similar commands, so should be called before /nextturn
--- a/openalbridge/ssound.c	Thu Oct 15 19:38:18 2009 +0000
+++ b/openalbridge/ssound.c	Thu Oct 15 21:47:05 2009 +0000
@@ -20,10 +20,11 @@
 #include "ssound.h"
 #include "loaders.h"
 
+extern SSound_t aSounds[MAX_SOUNDS];
 extern ALuint sources[MAX_SOURCES];
 extern const ALfloat NV[3];
 extern const ALfloat LO[6];
-
+extern int iNumSounds;
 extern char *prog;
 
 char SSound_load (SSound_t* pSound, const char* cFilename) {
@@ -90,11 +91,10 @@
 }
 
 void SSound_play(SSound_t* pSound, const char bLoop) {
-        int i;
+        int i, j;
         
         if(pSound->source == -1) // need a new source
         {
-                int i;
                 for(i = 0; i < MAX_SOURCES; i++)
                 {
                         ALint state;
@@ -106,6 +106,11 @@
 #endif
                                 alSourceStop(sources[pSound->source]);
                                 alGetError();
+
+								// lookup buffers associated with this source and reset them
+								for(j = 0; j < iNumSounds; j++)
+									if(aSounds[j].source == i)
+										aSounds[j].source = -1;
                                 break;
                         }
                 }
Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos.png has changed
Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos_bw.png has changed
Binary file share/hedgewars/Data/Graphics/Graves/octopus.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amMolotov.png has changed
Binary file share/hedgewars/Data/Graphics/Molotov.png has changed
--- a/share/hedgewars/Data/Locale/pt-pt.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Locale/pt-pt.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -39,8 +39,8 @@
 00:36=Mira Laser
 00:37=Vampirismo
 00:38=Sniper
-00:39=Pires Voador
-00:40=Molotov
+00:39=Disco Voador
+00:40=Coquetail Molotov
 
 01:00=Vamos lutar!
 01:01=Ronda empatada
@@ -51,11 +51,12 @@
 01:06=Morte súbita!
 01:07=Restante
 01:08=Combustível
+01:09=A sincronizar...
 
 ; Event messages
 ; Hog (%1) died
 02:00=%1 bateu a bota!
-02:00=%1 não viu a luz ao fundo do tunel!
+02:00=%1 não viu a luz ao fundo do túnel!
 02:00=%1 não esperava por esta!
 02:00=%1 acena um adeus!
 02:00=%1 foi para um local melhor!
@@ -64,13 +65,13 @@
 02:00=%1 cumpriu o seu dever!
 02:00=%1 faz o seu último sacrifício!
 02:00=%1 separa-se da sua forma física!
-02:00=%1 imita um encinho e "foice"!
+02:00=%1 imita um ancinho e "foice"!
 02:00=%1 passou da data de validade!
 02:00=%1 deseja paz no Mundo!
 02:00=%1 vai ser lembrado carinhosamente!
 02:00=%1 teve um aneurisma!
 02:00=%1 deixa para trás mulher e filhos
-02:00=%1 disparou a sua última bazuka
+02:00=%1 disparou a sua última bazuca
 02:00=%1 lançou a sua última granada
 02:00=%1 confeccionou o seu último bolo
 02:00=%1 pendurou-se na sua última corda
@@ -87,7 +88,7 @@
 02:00=%1 prefere wormux
 02:00=%1 esteve a bloquear tiros com a tromba
 02:00=%1 é um herói agora... no céu
-02:00=%1 encontrou o seu descanço
+02:00=%1 encontrou o seu descanso
 02:00=%1 saiu do edifício
 02:00=%1 segue as pisadas dos dinossauros
 02:00=%1 leva os ouriços mais perto da extinção
@@ -110,6 +111,7 @@
 02:00=%1 teve pouca tolerância ao levar porrada
 02:00=Dava jeito a %1 uma vida extra
 02:00=Há algum médico em casa?
+
 ; Hog (%1) drowned
 02:01=%1 brinca aos submarinos!
 02:01=%1 imita o Titanic!
@@ -128,7 +130,7 @@
 02:01=%1 'tá a dormir com os peixinhos
 02:01=%1 nunca gostou de aquários
 02:01=%1 disse que tinha sede
-02:01=o mar reclama %1
+02:01=O mar reclama %1
 02:01=%1 está perdido no mar
 02:01=%1 devia ter trazido o equipamento de mergulhador
 02:01=%1 vai ter um funeral no mar
@@ -160,6 +162,7 @@
 02:01=%1 'tá todo molhado
 02:01=%1 lavou as penas
 02:01=%1 agora vive no Pérola Negra
+
 ; Round starts
 02:02=Vamos lutar!
 02:02=Armado e preparado!
@@ -214,10 +217,13 @@
 02:02=Vai haver tiros e bombas e socos nas trombas!
 02:02=Não temas!
 02:02=Sê bravo e conquista
+
 ; Round ends (win; unused atm)
 02:03=...
+
 ; Round ends (draw; unused atm)
 02:04=...
+
 ; New health crate
 02:05=Auxílio iminente!
 02:05=Médico!
@@ -227,7 +233,7 @@
 02:05=O doutor chama
 02:05=Ligaduras frescas!
 02:05=Isto irá fazer-te sentir melhor
-02:05=Uma Hi-Potion! Ups, jogo errado
+02:05=Um Hi-Potion! Ups, jogo errado
 02:05=Um "agarra-me-já"!
 02:05=Agarra isso
 02:05=Um lanche rico em energia
@@ -235,6 +241,7 @@
 02:05=Dosagem Recomendada: quantas mais melhor!
 02:05=Entrega urgente
 02:05=Quem é que gritou socorro?
+
 ; New ammo crate
 02:06=Mais armas!
 02:06=Reforços!
@@ -246,12 +253,12 @@
 02:06=Um presente!
 02:06=Entrega especial!
 02:06=Deu-me um trabalhão enfiar a arma nesta caixa
-02:06=Brinquedos destrutívos a cair do paraíso
+02:06=Brinquedos destrutivos a cair do paraíso
 02:06=Aviso! Conteúdo volátil
 02:06=Agarrar ou rebentar, é contigo
 02:06=Coisas giras!
 02:06=Mmmmm-Munições
-02:06=Uma caixa de poder destructivo
+02:06=Uma caixa de poder destrutivo
 02:06=Correio aéreo!
 02:06=Não me parece que seja pizza
 02:06=Toma lá!
@@ -259,6 +266,7 @@
 02:06=Não deixes o inimigo tomar posse disto!
 02:06=Brinquedos novinhos em folha!
 02:06=Uma caixa misteriosa!
+
 ; New utility crate
 02:07=Hora das ferramentas!
 02:07=Isto poderá ser útil...
@@ -271,6 +279,7 @@
 02:07=Use com cabeça
 02:07=Ooo esta caixa é pesada
 02:07=Poderás precisar disto
+
 ; Hog (%1) skips his turn
 02:08=%1 é tãaao aborrecido...
 02:08=%1 não se quis incomodar
@@ -282,8 +291,8 @@
 02:08=%1 é mesmo preguiçoso
 02:08=%1 precisa de mais motivação
 02:08=%1 é pacífico
-02:08=%1 has a breather
-02:08=%1 tem um pequeno descanço
+02:08=%1 ficou sem fôlego
+02:08=%1 tem um pequeno descanso
 02:08=%1 relaxa
 02:08=%1 não tem fé nas suas capacidades
 02:08=%1 decide... não fazer nada
@@ -308,8 +317,9 @@
 02:08=%1 tem coisas melhores para fazer
 02:08=%1 tá cheio de medo
 02:08=%1 adormeceu
+
 ; Hog (%1) hurts himself only
-02:09=%1 devia praticar a apontaria!
+02:09=%1 devia praticar a pontaria!
 02:09=Parece que %1 se odeia a si mesmo
 02:09=%1 está do lado errado!
 02:09=%1 imita os emos
@@ -322,17 +332,17 @@
 02:09=Que jogada infeliz %1
 02:09=%1 é um descuidado com armas perigosas
 02:09=%1 devia considerar mudar de carreira
-02:09=Pior. Jogada. De sempre!
+02:09=Pior. Tiro. De sempre!
 02:09=Nã na ni na não %1, tens de acertar no INIMIGO!
 02:09=%1 devia ter destruído só o inimigo
 02:09=%1 aproxima-se do suicídio
 02:09=%1 ajuda o inimigo
-02:09=Que estúpido %1
+02:09=Isso foi mesmo estúpido %1
 02:09=%1 vive pelo ditado "sem dor, não há ganho"
 02:09=%1 está confuso
 02:09=%1 magoa-se na sua confusão
 02:09=%1 tem um fraco por se humilhar
-02:09=%1 está tonto!
+02:09=%1 é um desastrado!
 02:09=%1 é um desajeitado
 02:09=%1 mostra ao inimigo do que é capaz
 02:09=%1 diz que ninguém é sempre perfeito
@@ -343,7 +353,9 @@
 02:09=Tenho a certeza que ninguém viu isso, %1
 02:09=%1 precisa de reler o seu manual de campo
 02:09=A arma de %1 funcionou mal obviamente
+
 ; Hog shot an home run (using the bat and another hog)
 02:10=Home Run!
-02:10=A bird, a plane, ...
-02:10=That one is out!
+02:10=Será uma ave, um avião, ...
+02:10=Mais um para fora!
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Maps/Islands/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -0,0 +1,5 @@
+install(FILES
+	map.png
+	map.cfg
+	preview.png
+	DESTINATION ${SHAREPATH}Data/Maps/Islands)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Maps/Islands/map.cfg	Thu Oct 15 21:47:05 2009 +0000
@@ -0,0 +1,2 @@
+deepspace
+48
\ No newline at end of file
Binary file share/hedgewars/Data/Maps/Islands/map.png has changed
Binary file share/hedgewars/Data/Maps/Islands/preview.png has changed
--- a/share/hedgewars/Data/Themes/Bamboo/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Bamboo/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,15 +1,19 @@
 install(FILES
-	Bamboo.png
-	Bamboo2.png
-	Bamboo3.png
-	Border.png
-	Clouds.png
-	Flake.png
-	Flower.png
-	Girder.png
-	horizont.png
-	icon.png
-	LandTex.png
-	Sky.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Bamboo)
+    Bamboo2.png
+    Bamboo3.png
+    Bamboo.png
+    Border.png
+    Clouds.png
+    Flake.png
+    Flower.png
+    Girder.png
+    horizont-lowres.png
+    horizont.png
+    icon.png
+    LandTex.png
+    Sky-lowres.png
+    SkyL.png
+    Sky.png
+    SkyR.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Bamboo)
Binary file share/hedgewars/Data/Themes/Bamboo/SkyL.png has changed
Binary file share/hedgewars/Data/Themes/Bamboo/SkyR.png has changed
--- a/share/hedgewars/Data/Themes/Bath/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Bath/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,17 +1,21 @@
 install(FILES
-	Border.png
-	Bubble.png
-	Clouds.png
-	Duck.png
-	Duck2.png
-	Flake.png
-	Girder.png
-	LandTex.png
-	Sky.png
-	Toothbrush.png
-	Toothbrush_b.png
-	Toothbrush_g.png
-	horizont.png
-	icon.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Bath)
+    Border.png
+    Bubble.png
+    Clouds.png
+    Duck2.png
+    Duck.png
+    Flake.png
+    Girder.png
+    horizont-lowres.png
+    HorizontL.png
+    horizont.png
+    HorizontR.png
+    icon.png
+    LandTex.png
+    Sky-lowres.png
+    Sky.png
+    Toothbrush_b.png
+    Toothbrush_g.png
+    Toothbrush.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Bath)
Binary file share/hedgewars/Data/Themes/Bath/HorizontL.png has changed
Binary file share/hedgewars/Data/Themes/Bath/HorizontR.png has changed
--- a/share/hedgewars/Data/Themes/Blox/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Blox/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,13 +1,13 @@
 install(FILES
-	Border.png
-	Flake.png
-	LandTex.png
-	Sky.png
-	horizont.png
-	icon.png
-	plant1.png
-	plant2.png
-	plant3.png
-	plant4.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Blox)
+    Border.png
+    Flake.png
+    LandTex.png
+    Sky.png
+    horizont.png
+    icon.png
+    plant1.png
+    plant2.png
+    plant3.png
+    plant4.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Blox)
--- a/share/hedgewars/Data/Themes/Cake/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Cake/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,16 +1,16 @@
 install(FILES
-	BlueWater.png
-	Border.png
-	Cherry.png
-	Clouds.png
-	Flake.png
-	LandTex.png
-	Sky.png
-	horizont.png
-	icon.png
-	plant1.png
-	plant2.png
-	plant3.png
-	plant4.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Cake)
+    BlueWater.png
+    Border.png
+    Cherry.png
+    Clouds.png
+    Flake.png
+    LandTex.png
+    Sky.png
+    horizont.png
+    icon.png
+    plant1.png
+    plant2.png
+    plant3.png
+    plant4.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Cake)
--- a/share/hedgewars/Data/Themes/Castle/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Castle/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,16 +1,20 @@
 install(FILES
-	Axe.png
-	BlueWater.png
-	Border.png
-	Clouds.png
-	Flake.png
-	Girder.png
-	LandTex.png
-	Shield.png
-	Sky.png
-	Spear.png
-	Sword.png
-	horizont.png
-	icon.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Castle)
+    Axe.png
+    BlueWater.png
+    Border.png
+    Clouds.png
+    Flake.png
+    Girder.png
+    horizont-lowres.png
+    horizont.png
+    icon.png
+    LandTex.png
+    Shield.png
+    Sky-lowres.png
+    SkyL.png
+    Sky.png
+    SkyR.png
+    Spear.png
+    Sword.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Castle)
Binary file share/hedgewars/Data/Themes/Castle/SkyL.png has changed
Binary file share/hedgewars/Data/Themes/Castle/SkyR.png has changed
--- a/share/hedgewars/Data/Themes/City/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/City/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,14 +1,14 @@
 install(FILES
-	Border.png
-	Flake.png
-	Girder.png
-	horizont.png
-	icon.png
-	LandTex.png
-	plant1.png
-	plant2.png
-	plant3.png
-	plant4.png
-	Sky.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/City)
+    Border.png
+    Flake.png
+    Girder.png
+    horizont.png
+    icon.png
+    LandTex.png
+    plant1.png
+    plant2.png
+    plant3.png
+    plant4.png
+    Sky.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/City)
Binary file share/hedgewars/Data/Themes/Compost/BlueWater.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Border.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Compost/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -0,0 +1,23 @@
+install(FILES
+    BlueWater.png
+    Border.png
+    Carrot1.png
+    Carrot2.png
+    Carrot3.png
+    Carrot4.png
+    Clouds.png
+    Cucumber1.png
+    Cucumber2.png
+    Cucumber3.png
+    Cucumber4.png
+    Eggshell1.png
+    Eggshell2.png
+    Flake.png
+    Girder.png
+    horizont.png
+    icon.png
+    LandTex.png
+    Onion1.png
+    Onion2.png
+    Sky.png
+    DESTINATION ${SHAREPATH}Data/Themes/Compost)
Binary file share/hedgewars/Data/Themes/Compost/Carrot1.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Carrot2.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Carrot3.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Carrot4.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Clouds.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Cucumber1.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Cucumber2.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Cucumber3.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Cucumber4.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Eggshell1.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Eggshell2.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Flake.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Girder.png has changed
Binary file share/hedgewars/Data/Themes/Compost/LandTex.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Onion1.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Onion2.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Sky.png has changed
Binary file share/hedgewars/Data/Themes/Compost/horizont.png has changed
Binary file share/hedgewars/Data/Themes/Compost/icon.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Compost/theme.cfg	Thu Oct 15 21:47:05 2009 +0000
@@ -0,0 +1,34 @@
+92 151 253
+52 38 23
+$21 $15 $09
+$33 $21 $9 $0
+bath.ogg
+16
+8
+Eggshell1
+0 0 15 15 1 40 40 15 15
+Eggshell2
+0 0 15 15 1 40 40 15 15
+Onion1
+0 0 15 15 1 40 40 15 15
+Onion2
+0 0 15 15 1 40 40 15 15
+Cucumber1
+0 0 15 15 1 40 40 15 15
+Cucumber2
+0 0 15 15 1 40 40 15 15
+Carrot1
+0 0 15 15 1 40 40 15 15
+Carrot2
+0 0 15 15 1 40 40 15 15
+4
+Cucumber3
+1
+Cucumber4
+1
+Carrot3
+1
+Carrot4
+1
+100
+1 130 0 5
--- a/share/hedgewars/Data/Themes/CrazyMission/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/CrazyMission/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,7 +1,11 @@
 install(FILES
-	BlueWater.png
-	Flake.png
-	Sky.png
-	horizont.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/CrazyMission)
+    BlueWater.png
+    Flake.png
+    horizont-lowres.png
+    horizont.png
+    Sky-lowres.png
+    SkyL.png
+    Sky.png
+    SkyR.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/CrazyMission)
Binary file share/hedgewars/Data/Themes/CrazyMission/SkyL.png has changed
Binary file share/hedgewars/Data/Themes/CrazyMission/SkyR.png has changed
--- a/share/hedgewars/Data/Themes/EarthRise/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/EarthRise/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,12 +1,18 @@
 install(FILES
-	Border.png
-	Clouds.png
-	Flake.png
-	horizont.png
-	icon.png
-	LandTex.png
-	Rock.png
-	RockShort.png
-	Sky.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/EarthRise)
+    Border.png
+    Clouds.png
+    Flake.png
+    horizont-lowres.png
+    HorizontL.png
+    horizont.png
+    HorizontR.png
+    icon.png
+    LandTex.png
+    Rock.png
+    RockShort.png
+    Sky-lowres.png
+    SkyL.png
+    Sky.png
+    SkyR.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/EarthRise)
Binary file share/hedgewars/Data/Themes/EarthRise/HorizontL.png has changed
Binary file share/hedgewars/Data/Themes/EarthRise/HorizontR.png has changed
Binary file share/hedgewars/Data/Themes/EarthRise/SkyL.png has changed
Binary file share/hedgewars/Data/Themes/EarthRise/SkyR.png has changed
--- a/share/hedgewars/Data/Themes/Eyes/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Eyes/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,8 +1,8 @@
 install(FILES
-	BlueWater.png
-	Clouds.png
-	Flake.png
-	Sky.png
-	horizont.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Eyes)
+    BlueWater.png
+    Clouds.png
+    Flake.png
+    Sky.png
+    horizont.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Eyes)
--- a/share/hedgewars/Data/Themes/Freeway/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Freeway/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,16 +1,16 @@
 install(FILES
-	AppleDirt.png
-	AppleSmall.png
-	Border.png
-	BottleDirt.png
-	Clouds.png
-	FishDirt.png
-	Flake.png
-	icon.png
-	LandTex.png
-	Sky.png
-	Tire.png
-	TireDirt.png
-	horizont.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Freeway)
+    AppleDirt.png
+    AppleSmall.png
+    Border.png
+    BottleDirt.png
+    Clouds.png
+    FishDirt.png
+    Flake.png
+    icon.png
+    LandTex.png
+    Sky.png
+    Tire.png
+    TireDirt.png
+    horizont.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Freeway)
--- a/share/hedgewars/Data/Themes/Halloween/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Halloween/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,14 +1,17 @@
 install(FILES
-	BlueWater.png
-	Border.png
-	Clouds.png
-	Flake.png
-	Girder.png
-	LandTex.png
-	Rock.png
-	RockShort.png
-	Sky.png
-	horizont.png
-	icon.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Halloween)
+    BlueWater.png
+    Border.png
+    Clouds.png
+    Flake.png
+    Girder.png
+    horizont.png
+    icon.png
+    LandTex.png
+    Rock.png
+    RockShort.png
+    Sky-lowres.png
+    SkyL.png
+    Sky.png
+    SkyR.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Halloween)
Binary file share/hedgewars/Data/Themes/Halloween/SkyL.png has changed
Binary file share/hedgewars/Data/Themes/Halloween/SkyR.png has changed
--- a/share/hedgewars/Data/Themes/Island/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Island/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,14 +1,14 @@
 install(FILES
-	anchor.png
-	Border.png
-	Flake.png
-	horizont.png
-	icon.png
-	LandTex.png
-	plant1.png
-	plant2.png
-	plant3.png
-	plant4.png
-	Sky.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Island)
+    anchor.png
+    Border.png
+    Flake.png
+    horizont.png
+    icon.png
+    LandTex.png
+    plant1.png
+    plant2.png
+    plant3.png
+    plant4.png
+    Sky.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Island)
--- a/share/hedgewars/Data/Themes/Planes/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Planes/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,6 +1,6 @@
 install(FILES
-	Flake.png
-	horizont.png
-	Sky.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Planes)
+    Flake.png
+    horizont.png
+    Sky.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Planes)
--- a/share/hedgewars/Data/Themes/Sheep/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Sheep/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,26 +1,26 @@
 install(FILES
-	icon.png
-	mouton2.png
-	Border.png
-	mouton3.png
-	mouton4.png
-	fleurland2.png
-	grassp.png
-	grass.png
-	theme.cfg
-	fleurland3.png
-	grass2.png
-	fleurland4.png
-	Girder.png
-	mouton1.png
-	barriere.png
-	rocher.png
-	Flake.png
-	horizont.png
-	Sky.png
-	LandTex.png
-	grassp2.png
-	fleurland.png
-	fleur.png
-	Clouds.png
-	DESTINATION ${SHAREPATH}Data/Themes/Sheep)
+    icon.png
+    mouton2.png
+    Border.png
+    mouton3.png
+    mouton4.png
+    fleurland2.png
+    grassp.png
+    grass.png
+    theme.cfg
+    fleurland3.png
+    grass2.png
+    fleurland4.png
+    Girder.png
+    mouton1.png
+    barriere.png
+    rocher.png
+    Flake.png
+    horizont.png
+    Sky.png
+    LandTex.png
+    grassp2.png
+    fleurland.png
+    fleur.png
+    Clouds.png
+    DESTINATION ${SHAREPATH}Data/Themes/Sheep)
--- a/share/hedgewars/Data/Themes/Snow/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Snow/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,14 +1,14 @@
 install(FILES
-	Border.png
-	Flake.png
+    Border.png
+    Flake.png
     Girder.png
-	horizont.png
-	icon.png
-	LandTex.png
-	plant1.png
-	plant2.png
-	plant3.png
-	plant4.png
-	Sky.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Snow)
+    horizont.png
+    icon.png
+    LandTex.png
+    plant1.png
+    plant2.png
+    plant3.png
+    plant4.png
+    Sky.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Snow)
--- a/share/hedgewars/Data/Themes/Underwater/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/Underwater/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,17 +1,17 @@
 install(FILES
-	BlueWater.png
-	Border.png
-	Clouds.png
-	Flake.png
-	Girder.png
-	LandTex.png
-	Sky.png
-	anchor.png
-	clam.png
-	coral.png
-	coral2.png
-	crab.png
-	horizont.png
-	icon.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/Underwater)
+    BlueWater.png
+    Border.png
+    Clouds.png
+    Flake.png
+    Girder.png
+    LandTex.png
+    Sky.png
+    anchor.png
+    clam.png
+    coral.png
+    coral2.png
+    crab.png
+    horizont.png
+    icon.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/Underwater)
--- a/share/hedgewars/Data/Themes/cheese/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/cheese/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,6 +1,6 @@
 file(GLOB images *.png)
 
 install(FILES
-	theme.cfg
-	${images}
-	DESTINATION ${SHAREPATH}Data/Themes/cheese)
+    theme.cfg
+    ${images}
+    DESTINATION ${SHAREPATH}Data/Themes/cheese)
Binary file share/hedgewars/Data/Themes/deepspace/BlueWater.png has changed
Binary file share/hedgewars/Data/Themes/deepspace/Border.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/deepspace/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -0,0 +1,9 @@
+install(FILES
+    BlueWater.png
+    Border.png
+    Clouds.png
+    Flake.png
+    horizont.png
+    Sky.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/deepspace)
Binary file share/hedgewars/Data/Themes/deepspace/Clouds.png has changed
Binary file share/hedgewars/Data/Themes/deepspace/Flake.png has changed
Binary file share/hedgewars/Data/Themes/deepspace/Sky.png has changed
Binary file share/hedgewars/Data/Themes/deepspace/horizont.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/deepspace/theme.cfg	Thu Oct 15 21:47:05 2009 +0000
@@ -0,0 +1,9 @@
+0 0 0
+175 177 75
+$2B $2B $2B
+$2A $2A $2A $CC
+hell.ogg
+9
+0
+0
+50
--- a/share/hedgewars/Data/Themes/hell/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/hell/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,15 +1,15 @@
 install(FILES
-	BlueWater.png
-	Border.png
-	Clouds.png
-	Flake.png
-	horizont.png
-	icon.png
-	LandTex.png
-	plant1.png
-	plant2.png
-	plant3.png
-	plant4.png
-	Sky.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/hell)
+    BlueWater.png
+    Border.png
+    Clouds.png
+    Flake.png
+    horizont.png
+    icon.png
+    LandTex.png
+    plant1.png
+    plant2.png
+    plant3.png
+    plant4.png
+    Sky.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/hell)
--- a/share/hedgewars/Data/Themes/nature/CMakeLists.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Themes/nature/CMakeLists.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,14 +1,14 @@
 install(FILES
-	Border.png
-	Flake.png
-	Girder.png
-	horizont.png
-	icon.png
-	LandTex.png
-	plant1.png
-	plant2.png
-	plant3.png
-	plant4.png
-	Sky.png
-	theme.cfg
-	DESTINATION ${SHAREPATH}Data/Themes/nature)
+    Border.png
+    Flake.png
+    Girder.png
+    horizont.png
+    icon.png
+    LandTex.png
+    plant1.png
+    plant2.png
+    plant3.png
+    plant4.png
+    Sky.png
+    theme.cfg
+    DESTINATION ${SHAREPATH}Data/Themes/nature)
--- a/share/hedgewars/Data/Trainings/001_Shotgun.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Trainings/001_Shotgun.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -6,7 +6,7 @@
 $delay 0
 map mushrooms
 theme nature
-ammstore 00009000000000000000000000000000000000
+ammstore 00009000000000000000000000000000000000000000000000000000000000000000000000000000
 hhcoords 2334 1254
 addtrig s2147483649 1 1 30 2154 1274 1
 addtrig s1 1 1 30 2334 1914 2
--- a/share/hedgewars/Data/Trainings/002_Bazooka.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Trainings/002_Bazooka.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -6,7 +6,7 @@
 $delay 0
 map Volcano
 theme Volcano
-ammstore 00900000000000000000
+ammstore 00900000000000000000000000000000000000000000000000000000000000000000000000000000
 hhcoords 1710 765
 addtrig s2147483649 1 1 33 1150 650 1
 addtrig s1 1 1 33 1770 650 2
--- a/share/hedgewars/Data/Trainings/003_RCPlane.txt	Thu Oct 15 19:38:18 2009 +0000
+++ b/share/hedgewars/Data/Trainings/003_RCPlane.txt	Thu Oct 15 21:47:05 2009 +0000
@@ -1,12 +1,12 @@
 seed 1
 $gmflags 268435458
-$trflags 15
+$trflags 31
 $turntime 30000
 $casefreq 0
 $landadds 0
 $delay 0
 map EarthRise
 theme nature
-ammstore 000000000000000000000000000000100000000000000000000000000000000000000000000000
+ammstore 00000000000000000000000000000010000000000000000000000000000000000000000000000000
 addtrig C7 1 1
 addtrig F2147483649 2 1