Cleanups

109 files changed, 197 insertions, 55 deletions

diff --git a/src/CBot/CBot.aps b/src/CBot/CBot.aps
deleted file mode 100644
index cd294ec..0000000
--- a/src/CBot/CBot.aps
+++ /dev/null
diff --git a/src/CBot/_Copy.bat b/src/CBot/_Copy.bat
deleted file mode 100644
index 510dc5a..0000000
--- a/src/CBot/_Copy.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-copy debug\cbot.dll "F:\Program Files\Ceebot\cbot.dll" 

-cls
\ No newline at end of file
diff --git a/src/CBot/colobot.ini b/src/CBot/colobot.ini
deleted file mode 100644
index 32163db..0000000
--- a/src/CBot/colobot.ini
+++ /dev/null
@@ -1,49 +0,0 @@
-[Directory]

-scene=scene

-savegame=savegame

-public=program

-user=user

-[Setup]

-TotoMode=1

-Tooltips=1

-InterfaceGlint=1

-NiceMouse=0

-Movies=1

-NiceReset=1

-HimselfDamage=1

-CameraScroll=1

-CameraInvertX=0

-InterfaceEffect=1

-GroundShadow=1

-GroundSpot=1

-ObjectDirty=1

-FogMode=1

-LensMode=1

-SkyMode=1

-PlanetMode=1

-LightMode=1

-UseJoystick=0

-ParticuleDensity=1.00

-ClippingDistance=1.00

-ObjectDetail=2.00

-GadgetQuantity=1.00

-TextureQuality=1

-AudioVolume=20

-MidiVolume=15

-Sound3D=0

-EditIndentMode=1

-EditIndentValue=4

-KeyMap=37+0 39+0 38+0 40+0 16+0 17+0 32+258 96+262 13+257 107+261 109+260 9+259 36+263 27+0 112+0 113+0 110+0 115+0 116+0 117+0 

-[Engine]

-AlphaMode=1

-StateColor=-1

-BlackSrcBlend=0

-BlackDestBlend=0

-WhiteSrcBlend=0

-WhiteDestBlend=0

-DiffuseSrcBlend=0

-DiffuseDestBlend=0

-AlphaSrcBlend=0

-AlphaDestBlend=0

-[Gamer]

-LastName=Player

diff --git a/src/CBot/resource.h b/src/CBot/resource.h
index 6bf48e1..da1ad23 100644
--- a/src/CBot/resource.h
+++ b/src/CBot/resource.h
@@ -12,7 +12,9 @@
 // * GNU General Public License for more details.

 // *

 // * You should have received a copy of the GNU General Public License

-// * along with this program. If not, see  http://www.gnu.org/licenses/.//{{NO_DEPENDENCIES}}

+// * along with this program. If not, see  http://www.gnu.org/licenses/.

+

+#pragma once

 #ifndef _RESOURCE_H_

 #define _RESOURCE_H_

 

@@ -173,4 +175,3 @@ enum EID
 #define TX_ERRWRITE                     6015

 

 #endif //_RESOURCE_H_

-

diff --git a/src/CBot/TestCBot/CBotConsoleDlg.cpp b/src/CBot/tests/TestCBot/CBotConsoleDlg.cpp
index 55a271a..55a271a 100644
--- a/src/CBot/TestCBot/CBotConsoleDlg.cpp
+++ b/src/CBot/tests/TestCBot/CBotConsoleDlg.cpp
diff --git a/src/CBot/TestCBot/CBotConsoleDlg.h b/src/CBot/tests/TestCBot/CBotConsoleDlg.h
index f289a4d..f289a4d 100644
--- a/src/CBot/TestCBot/CBotConsoleDlg.h
+++ b/src/CBot/tests/TestCBot/CBotConsoleDlg.h
diff --git a/src/CBot/TestCBot/ChildFrm.cpp b/src/CBot/tests/TestCBot/ChildFrm.cpp
index 4c40f90..4c40f90 100644
--- a/src/CBot/TestCBot/ChildFrm.cpp
+++ b/src/CBot/tests/TestCBot/ChildFrm.cpp
diff --git a/src/CBot/TestCBot/ChildFrm.h b/src/CBot/tests/TestCBot/ChildFrm.h
index 2ad57b6..2ad57b6 100644
--- a/src/CBot/TestCBot/ChildFrm.h
+++ b/src/CBot/tests/TestCBot/ChildFrm.h
diff --git a/src/CBot/TestCBot/MainFrm.cpp b/src/CBot/tests/TestCBot/MainFrm.cpp
index 6669350..6669350 100644
--- a/src/CBot/TestCBot/MainFrm.cpp
+++ b/src/CBot/tests/TestCBot/MainFrm.cpp
diff --git a/src/CBot/TestCBot/MainFrm.h b/src/CBot/tests/TestCBot/MainFrm.h
index a1d34f4..a1d34f4 100644
--- a/src/CBot/TestCBot/MainFrm.h
+++ b/src/CBot/tests/TestCBot/MainFrm.h
diff --git a/src/CBot/TestCBot/PerformDlg.cpp b/src/CBot/tests/TestCBot/PerformDlg.cpp
index 8abbb4b..8abbb4b 100644
--- a/src/CBot/TestCBot/PerformDlg.cpp
+++ b/src/CBot/tests/TestCBot/PerformDlg.cpp
diff --git a/src/CBot/TestCBot/PerformDlg.h b/src/CBot/tests/TestCBot/PerformDlg.h
index 29d567f..29d567f 100644
--- a/src/CBot/TestCBot/PerformDlg.h
+++ b/src/CBot/tests/TestCBot/PerformDlg.h
diff --git a/src/CBot/TestCBot/Routines.cpp b/src/CBot/tests/TestCBot/Routines.cpp
index b37f027..b37f027 100644
--- a/src/CBot/TestCBot/Routines.cpp
+++ b/src/CBot/tests/TestCBot/Routines.cpp
diff --git a/src/CBot/TestCBot/StdAfx.cpp b/src/CBot/tests/TestCBot/StdAfx.cpp
index 7dd0f00..7dd0f00 100644
--- a/src/CBot/TestCBot/StdAfx.cpp
+++ b/src/CBot/tests/TestCBot/StdAfx.cpp
diff --git a/src/CBot/TestCBot/StdAfx.h b/src/CBot/tests/TestCBot/StdAfx.h
index c3659fb..c3659fb 100644
--- a/src/CBot/TestCBot/StdAfx.h
+++ b/src/CBot/tests/TestCBot/StdAfx.h
diff --git a/src/CBot/TestCBot/TestCBot.clw b/src/CBot/tests/TestCBot/TestCBot.clw
index 13f20f4..13f20f4 100644
--- a/src/CBot/TestCBot/TestCBot.clw
+++ b/src/CBot/tests/TestCBot/TestCBot.clw
diff --git a/src/CBot/TestCBot/TestCBot.cpp b/src/CBot/tests/TestCBot/TestCBot.cpp
index a76040a..a76040a 100644
--- a/src/CBot/TestCBot/TestCBot.cpp
+++ b/src/CBot/tests/TestCBot/TestCBot.cpp
diff --git a/src/CBot/TestCBot/TestCBot.dsp b/src/CBot/tests/TestCBot/TestCBot.dsp
index 8ed9b11..8ed9b11 100644
--- a/src/CBot/TestCBot/TestCBot.dsp
+++ b/src/CBot/tests/TestCBot/TestCBot.dsp
diff --git a/src/CBot/TestCBot/TestCBot.h b/src/CBot/tests/TestCBot/TestCBot.h
index b3b15db..c2595b6 100644
--- a/src/CBot/TestCBot/TestCBot.h
+++ b/src/CBot/tests/TestCBot/TestCBot.h
@@ -26,7 +26,7 @@
 	#error include 'stdafx.h' before including this file for PCH

 #endif

 

-#include "resource.h"       // main symbols

+#include "resource.h"       	// main symbols

 //#include "../CbotDll.h"	// librairie CBot

 #include "../Cbot.h"		// complet pour Browse

 

@@ -43,7 +43,7 @@ public:
 	CTestCBotApp();

 

 	CEdit*			m_pConsole;

-	CTestCBotView*	m_LastActive;

+	CTestCBotView*		m_LastActive;

 	CBotClass*		m_pClassPoint;

 	CBotClass*		m_pClassPointIntr;

 

diff --git a/src/CBot/TestCBot/TestCBot.rc b/src/CBot/tests/TestCBot/TestCBot.rc
index 137458c..137458c 100644
--- a/src/CBot/TestCBot/TestCBot.rc
+++ b/src/CBot/tests/TestCBot/TestCBot.rc
diff --git a/src/CBot/TestCBot/TestCBotDoc.cpp b/src/CBot/tests/TestCBot/TestCBotDoc.cpp
index 8880c57..8880c57 100644
--- a/src/CBot/TestCBot/TestCBotDoc.cpp
+++ b/src/CBot/tests/TestCBot/TestCBotDoc.cpp
diff --git a/src/CBot/TestCBot/TestCBotDoc.h b/src/CBot/tests/TestCBot/TestCBotDoc.h
index 548607f..548607f 100644
--- a/src/CBot/TestCBot/TestCBotDoc.h
+++ b/src/CBot/tests/TestCBot/TestCBotDoc.h
diff --git a/src/CBot/TestCBot/TestCBotView.cpp b/src/CBot/tests/TestCBot/TestCBotView.cpp
index bca3c56..bca3c56 100644
--- a/src/CBot/TestCBot/TestCBotView.cpp
+++ b/src/CBot/tests/TestCBot/TestCBotView.cpp
diff --git a/src/CBot/TestCBot/TestCBotView.h b/src/CBot/tests/TestCBot/TestCBotView.h
index 065ee08..065ee08 100644
--- a/src/CBot/TestCBot/TestCBotView.h
+++ b/src/CBot/tests/TestCBot/TestCBotView.h
diff --git a/src/CBot/TestCBot/a§1.txt b/src/CBot/tests/TestCBot/a§1.txt~
index 0c57950..0c57950 100644
--- a/src/CBot/TestCBot/a§1.txt
+++ b/src/CBot/tests/TestCBot/a§1.txt~
diff --git a/src/CBot/TestCBot/res/TestCBot.ico b/src/CBot/tests/TestCBot/res/TestCBot.ico
index 06a649d..06a649d 100644
--- a/src/CBot/TestCBot/res/TestCBot.ico
+++ b/src/CBot/tests/TestCBot/res/TestCBot.ico
diff --git a/src/CBot/TestCBot/res/TestCBot.rc2 b/src/CBot/tests/TestCBot/res/TestCBot.rc2
index b55f0d9..b55f0d9 100644
--- a/src/CBot/TestCBot/res/TestCBot.rc2
+++ b/src/CBot/tests/TestCBot/res/TestCBot.rc2
diff --git a/src/CBot/TestCBot/res/TestCBotDoc.ico b/src/CBot/tests/TestCBot/res/TestCBotDoc.ico
index 3545614..3545614 100644
--- a/src/CBot/TestCBot/res/TestCBotDoc.ico
+++ b/src/CBot/tests/TestCBot/res/TestCBotDoc.ico
diff --git a/src/CBot/TestCBot/res/Toolbar.bmp b/src/CBot/tests/TestCBot/res/Toolbar.bmp
index 04a71af..04a71af 100644
--- a/src/CBot/TestCBot/res/Toolbar.bmp
+++ b/src/CBot/tests/TestCBot/res/Toolbar.bmp
diff --git a/src/CBot/TestCBot/resource.h b/src/CBot/tests/TestCBot/resource.h
index d661201..d661201 100644
--- a/src/CBot/TestCBot/resource.h
+++ b/src/CBot/tests/TestCBot/resource.h
diff --git a/src/CBot/TestCBot/B.txt b/src/CBot/tests/TestCBot/scenarios/B.txt
index 53715f8..53715f8 100644
--- a/src/CBot/TestCBot/B.txt
+++ b/src/CBot/tests/TestCBot/scenarios/B.txt
diff --git a/src/CBot/TestCBot/BUG2.txt b/src/CBot/tests/TestCBot/scenarios/BUG2.txt
index 44de05a..44de05a 100644
--- a/src/CBot/TestCBot/BUG2.txt
+++ b/src/CBot/tests/TestCBot/scenarios/BUG2.txt
diff --git a/src/CBot/TestCBot/Deleted.txt b/src/CBot/tests/TestCBot/scenarios/Deleted.txt
index 469a624..469a624 100644
--- a/src/CBot/TestCBot/Deleted.txt
+++ b/src/CBot/tests/TestCBot/scenarios/Deleted.txt
diff --git a/src/CBot/TestCBot/MaClass.txt b/src/CBot/tests/TestCBot/scenarios/MaClass.txt
index ac472b4..ac472b4 100644
--- a/src/CBot/TestCBot/MaClass.txt
+++ b/src/CBot/tests/TestCBot/scenarios/MaClass.txt
diff --git a/src/CBot/TestCBot/Mc2.txt b/src/CBot/tests/TestCBot/scenarios/Mc2.txt
index 172c259..172c259 100644
--- a/src/CBot/TestCBot/Mc2.txt
+++ b/src/CBot/tests/TestCBot/scenarios/Mc2.txt
diff --git a/src/CBot/TestCBot/Mon fichier.txt b/src/CBot/tests/TestCBot/scenarios/Mon fichier.txt
index 6b35bf8..6b35bf8 100644
--- a/src/CBot/TestCBot/Mon fichier.txt
+++ b/src/CBot/tests/TestCBot/scenarios/Mon fichier.txt
diff --git a/src/CBot/TestCBot/Nop.txt b/src/CBot/tests/TestCBot/scenarios/Nop.txt
index 6a66f6f..6a66f6f 100644
--- a/src/CBot/TestCBot/Nop.txt
+++ b/src/CBot/tests/TestCBot/scenarios/Nop.txt
diff --git a/src/CBot/TestCBot/POS.txt b/src/CBot/tests/TestCBot/scenarios/POS.txt
index 688e4fb..688e4fb 100644
--- a/src/CBot/TestCBot/POS.txt
+++ b/src/CBot/tests/TestCBot/scenarios/POS.txt
diff --git a/src/CBot/TestCBot/T.txt b/src/CBot/tests/TestCBot/scenarios/T.txt
index 50a792b..50a792b 100644
--- a/src/CBot/TestCBot/T.txt
+++ b/src/CBot/tests/TestCBot/scenarios/T.txt
diff --git a/src/CBot/TestCBot/TESTALL.txt b/src/CBot/tests/TestCBot/scenarios/TESTALL.txt
index 82247a0..82247a0 100644
--- a/src/CBot/TestCBot/TESTALL.txt
+++ b/src/CBot/tests/TestCBot/scenarios/TESTALL.txt
diff --git a/src/CBot/TestCBot/TestCB1.txt b/src/CBot/tests/TestCBot/scenarios/TestCB1.txt
index 516db47..516db47 100644
--- a/src/CBot/TestCBot/TestCB1.txt
+++ b/src/CBot/tests/TestCBot/scenarios/TestCB1.txt
diff --git a/src/CBot/TestCBot/TestCBot1.txt b/src/CBot/tests/TestCBot/scenarios/TestCBot1.txt
index d27b4f8..d27b4f8 100644
--- a/src/CBot/TestCBot/TestCBot1.txt
+++ b/src/CBot/tests/TestCBot/scenarios/TestCBot1.txt
diff --git a/src/CBot/TestCBot/TestCBot3.txt b/src/CBot/tests/TestCBot/scenarios/TestCBot3.txt
index b915f96..b915f96 100644
--- a/src/CBot/TestCBot/TestCBot3.txt
+++ b/src/CBot/tests/TestCBot/scenarios/TestCBot3.txt
diff --git a/src/CBot/TestCBot/TestNull.txt b/src/CBot/tests/TestCBot/scenarios/TestNull.txt
index f447245..f447245 100644
--- a/src/CBot/TestCBot/TestNull.txt
+++ b/src/CBot/tests/TestCBot/scenarios/TestNull.txt
diff --git a/src/CBot/TestCBot/TestRestoreState.txt b/src/CBot/tests/TestCBot/scenarios/TestRestoreState.txt
index 1e49e37..1e49e37 100644
--- a/src/CBot/TestCBot/TestRestoreState.txt
+++ b/src/CBot/tests/TestCBot/scenarios/TestRestoreState.txt
diff --git a/src/CBot/TestCBot/TestStatic.txt b/src/CBot/tests/TestCBot/scenarios/TestStatic.txt
index f501aa5..f501aa5 100644
--- a/src/CBot/TestCBot/TestStatic.txt
+++ b/src/CBot/tests/TestCBot/scenarios/TestStatic.txt
diff --git a/src/CBot/TestCBot/TestStr.txt b/src/CBot/tests/TestCBot/scenarios/TestStr.txt
index 683ec1b..683ec1b 100644
--- a/src/CBot/TestCBot/TestStr.txt
+++ b/src/CBot/tests/TestCBot/scenarios/TestStr.txt
diff --git a/src/CBot/TestCBot/Z.txt b/src/CBot/tests/TestCBot/scenarios/Z.txt
index 714119b..714119b 100644
--- a/src/CBot/TestCBot/Z.txt
+++ b/src/CBot/tests/TestCBot/scenarios/Z.txt
diff --git a/src/CBot/TestCBot/až1.txt b/src/CBot/tests/TestCBot/scenarios/a1.txt
index 165bc95..165bc95 100644
--- a/src/CBot/TestCBot/až1.txt
+++ b/src/CBot/tests/TestCBot/scenarios/a1.txt
diff --git a/src/CBot/TestCBot/array.txt b/src/CBot/tests/TestCBot/scenarios/array.txt
index 081b60e..081b60e 100644
--- a/src/CBot/TestCBot/array.txt
+++ b/src/CBot/tests/TestCBot/scenarios/array.txt
diff --git a/src/CBot/tests/TestCBot/scenarios/až1.txt b/src/CBot/tests/TestCBot/scenarios/až1.txt
new file mode 100644
index 0000000..165bc95
--- /dev/null
+++ b/src/CBot/tests/TestCBot/scenarios/až1.txt
@@ -0,0 +1,96 @@
+object radarGuepe(point orig, float dist)
+{
+	int i;
+	object pr, r;
+	float mindist;
+	
+	i = 0;
+	mindist = 1000;
+	while (i<30)
+	{
+		pr = radar(i);
+		if (pr != null)
+		{
+			
+			if (F(orig, pr.position) < mindist and pr.category == AlienWasp and pr.altitude > 3)
+			{
+				mindist = distance(orig, pr.position);
+				r = pr;
+			}
+		}
+		i = i+1;
+	}
+	if (mindist < dist) return(r); else return(null);
+}
+
+
+class Guepe
+{
+	
+	point pos;
+	
+	
+	void cherche(point orig, float dist)
+	{
+		object p;
+		point o;
+		
+		p = radarGuepe(orig, dist);
+		while (p == null)
+		{
+			wait(0.1);
+			p = radarGuepe(orig, dist);
+		}
+		
+		pos.x = p.position.x;
+		pos.y = p.position.y;
+		pos.z = p.position.z;
+		
+		//o = p.position;
+		//wait(0.1);
+		
+		//vitessex = (p.position.x - o.x)/0.1;
+		//vitessey = (p.position.y - o.y)/0.1;
+		//vitessez = (p.position.z - o.z)/0.1;
+		
+	}
+	
+	
+	void tire(point orig, float orient)
+	{
+		//float t = 3;          //temps d'anticipation
+		float angle;
+		point cible;
+		
+		cible.x = pos.x;// + t*vitessex;
+		cible.y = pos.y;// + t*vitessey;
+		cible.z = pos.z;// + t*vitessez;
+		
+		if (cible.x == 0) angle = 90; else
+		  angle = atan(cible.y / cible.x);
+		if (cible.x < 0) angle = angle + 180;
+		angle = angle - orient;
+		if (angle > 180) angle = angle - 360;
+		if (angle < -180) angle = angle + 360;
+		turn(angle);
+		
+		angle = atan((cible.z-orig.z) / distance2d(orig, cible));
+		aim(angle);
+		
+		fire(0.1);
+		
+	}
+}
+
+extern void object::Fourmi6()
+{
+	//fps(1000);
+	Guepe guepe = new Guepe();
+	
+	while (true)
+	{
+		guepe.cherche(position, 50);
+		
+		guepe.tire(position, orientation);
+	}
+}
diff --git a/src/CBot/tests/TestCBot/scenarios/a§1.txt b/src/CBot/tests/TestCBot/scenarios/a§1.txt
new file mode 100644
index 0000000..0c57950
--- /dev/null
+++ b/src/CBot/tests/TestCBot/scenarios/a§1.txt
@@ -0,0 +1,96 @@
+object radarGuepe(point orig, float dist)

+{

+	int i;

+	object pr, r;

+	float mindist;

+	

+	i = 0;

+	mindist = 1000;

+	while (i<30)

+	{

+		pr = radar(i);

+		if (pr != null)

+		{

+			

+			if (F(orig, pr.position) < mindist and pr.category == AlienWasp and pr.altitude > 3)

+			{

+				mindist = distance(orig, pr.position);

+				r = pr;

+			}

+		}

+		i = i+1;

+	}

+	if (mindist < dist) return(r); else return(null);

+}

+

+

+class Guepe

+{

+	

+	point pos;

+	

+	

+	void cherche(point orig, float dist)

+	{

+		object p;

+		point o;

+		

+		p = radarGuepe(orig, dist);

+		while (p == null)

+		{

+			wait(0.1);

+			p = radarGuepe(orig, dist);

+		}

+		

+		pos.x = p.position.x;

+		pos.y = p.position.y;

+		pos.z = p.position.z;

+		

+		//o = p.position;

+		//wait(0.1);

+		

+		//vitessex = (p.position.x - o.x)/0.1;

+		//vitessey = (p.position.y - o.y)/0.1;

+		//vitessez = (p.position.z - o.z)/0.1;

+		

+	}

+	

+	

+	void tire(point orig, float orient)

+	{

+		//float t = 3;          //temps d'anticipation

+		float angle;

+		point cible;

+		

+		cible.x = pos.x;// + t*vitessex;

+		cible.y = pos.y;// + t*vitessey;

+		cible.z = pos.z;// + t*vitessez;

+		

+		if (cible.x == 0) angle = 90; else

+		  angle = atan(cible.y / cible.x);

+		if (cible.x < 0) angle = angle + 180;

+		angle = angle - orient;

+		if (angle > 180) angle = angle - 360;

+		if (angle < -180) angle = angle + 360;

+		turn(angle);

+		

+		angle = atan((cible.z-orig.z) / distance2d(orig, cible));

+		aim(angle);

+		

+		fire(0.1);

+		

+	}

+}

+

+extern void object::Fourmi6()

+{

+	//fps(1000);

+	Guepe guepe = new Guepe();

+	

+	while (true)

+	{

+		guepe.cherche(position, 50);

+		

+		guepe.tire(position, orientation);

+	}

+}

diff --git a/src/CBot/TestCBot/bug.txt b/src/CBot/tests/TestCBot/scenarios/bug.txt
index 4ec6eb3..4ec6eb3 100644
--- a/src/CBot/TestCBot/bug.txt
+++ b/src/CBot/tests/TestCBot/scenarios/bug.txt
diff --git a/src/CBot/TestCBot/bugmw.txt b/src/CBot/tests/TestCBot/scenarios/bugmw.txt
index 284ee43..284ee43 100644
--- a/src/CBot/TestCBot/bugmw.txt
+++ b/src/CBot/tests/TestCBot/scenarios/bugmw.txt
diff --git a/src/CBot/TestCBot/ccc.txt b/src/CBot/tests/TestCBot/scenarios/ccc.txt
index dbcd1d5..dbcd1d5 100644
--- a/src/CBot/TestCBot/ccc.txt
+++ b/src/CBot/tests/TestCBot/scenarios/ccc.txt
diff --git a/src/CBot/TestCBot/enum.txt b/src/CBot/tests/TestCBot/scenarios/enum.txt
index a592a7f..a592a7f 100644
--- a/src/CBot/TestCBot/enum.txt
+++ b/src/CBot/tests/TestCBot/scenarios/enum.txt
diff --git a/src/CBot/TestCBot/fibo.txt b/src/CBot/tests/TestCBot/scenarios/fibo.txt
index 88f5357..88f5357 100644
--- a/src/CBot/TestCBot/fibo.txt
+++ b/src/CBot/tests/TestCBot/scenarios/fibo.txt
diff --git a/src/CBot/TestCBot/file.txt b/src/CBot/tests/TestCBot/scenarios/file.txt
index 2a22dd9..2a22dd9 100644
--- a/src/CBot/TestCBot/file.txt
+++ b/src/CBot/tests/TestCBot/scenarios/file.txt
diff --git a/src/CBot/TestCBot/h.txt b/src/CBot/tests/TestCBot/scenarios/h.txt
index c395319..c395319 100644
--- a/src/CBot/TestCBot/h.txt
+++ b/src/CBot/tests/TestCBot/scenarios/h.txt
diff --git a/src/CBot/TestCBot/include.txt b/src/CBot/tests/TestCBot/scenarios/include.txt
index e8f8cc9..e8f8cc9 100644
--- a/src/CBot/TestCBot/include.txt
+++ b/src/CBot/tests/TestCBot/scenarios/include.txt
diff --git a/src/CBot/TestCBot/intrinsic.txt b/src/CBot/tests/TestCBot/scenarios/intrinsic.txt
index f215791..f215791 100644
--- a/src/CBot/TestCBot/intrinsic.txt
+++ b/src/CBot/tests/TestCBot/scenarios/intrinsic.txt
diff --git a/src/CBot/TestCBot/methode1.txt b/src/CBot/tests/TestCBot/scenarios/methode1.txt
index 080bba2..080bba2 100644
--- a/src/CBot/TestCBot/methode1.txt
+++ b/src/CBot/tests/TestCBot/scenarios/methode1.txt
diff --git a/src/CBot/TestCBot/methode2.txt b/src/CBot/tests/TestCBot/scenarios/methode2.txt
index 76ce7f4..76ce7f4 100644
--- a/src/CBot/TestCBot/methode2.txt
+++ b/src/CBot/tests/TestCBot/scenarios/methode2.txt
diff --git a/src/CBot/TestCBot/mp1.txt b/src/CBot/tests/TestCBot/scenarios/mp1.txt
index 599cfc4..599cfc4 100644
--- a/src/CBot/TestCBot/mp1.txt
+++ b/src/CBot/tests/TestCBot/scenarios/mp1.txt
diff --git a/src/CBot/TestCBot/mp2.txt b/src/CBot/tests/TestCBot/scenarios/mp2.txt
index 1c2972c..1c2972c 100644
--- a/src/CBot/TestCBot/mp2.txt
+++ b/src/CBot/tests/TestCBot/scenarios/mp2.txt
diff --git a/src/CBot/TestCBot/mw.txt b/src/CBot/tests/TestCBot/scenarios/mw.txt
index c237670..c237670 100644
--- a/src/CBot/TestCBot/mw.txt
+++ b/src/CBot/tests/TestCBot/scenarios/mw.txt
diff --git a/src/CBot/TestCBot/null.txt b/src/CBot/tests/TestCBot/scenarios/null.txt
index ae76b74..ae76b74 100644
--- a/src/CBot/TestCBot/null.txt
+++ b/src/CBot/tests/TestCBot/scenarios/null.txt
diff --git a/src/CBot/TestCBot/opnew.txt b/src/CBot/tests/TestCBot/scenarios/opnew.txt
index 7d6838c..7d6838c 100644
--- a/src/CBot/TestCBot/opnew.txt
+++ b/src/CBot/tests/TestCBot/scenarios/opnew.txt
diff --git a/src/CBot/TestCBot/plante.txt b/src/CBot/tests/TestCBot/scenarios/plante.txt
index 363461b..363461b 100644
--- a/src/CBot/TestCBot/plante.txt
+++ b/src/CBot/tests/TestCBot/scenarios/plante.txt
diff --git a/src/CBot/TestCBot/pointer.txt b/src/CBot/tests/TestCBot/scenarios/pointer.txt
index 2d4d907..2d4d907 100644
--- a/src/CBot/TestCBot/pointer.txt
+++ b/src/CBot/tests/TestCBot/scenarios/pointer.txt
diff --git a/src/CBot/TestCBot/postinc.txt b/src/CBot/tests/TestCBot/scenarios/postinc.txt
index cdf6ab5..cdf6ab5 100644
--- a/src/CBot/TestCBot/postinc.txt
+++ b/src/CBot/tests/TestCBot/scenarios/postinc.txt
diff --git a/src/CBot/TestCBot/radar.txt b/src/CBot/tests/TestCBot/scenarios/radar.txt
index 09d84a2..09d84a2 100644
--- a/src/CBot/TestCBot/radar.txt
+++ b/src/CBot/tests/TestCBot/scenarios/radar.txt
diff --git a/src/CBot/TestCBot/solution.txt b/src/CBot/tests/TestCBot/scenarios/solution.txt
index f78cf12..f78cf12 100644
--- a/src/CBot/TestCBot/solution.txt
+++ b/src/CBot/tests/TestCBot/scenarios/solution.txt
diff --git a/src/CBot/TestCBot/test.txt b/src/CBot/tests/TestCBot/scenarios/test.txt
index a912415..a912415 100644
--- a/src/CBot/TestCBot/test.txt
+++ b/src/CBot/tests/TestCBot/scenarios/test.txt
diff --git a/src/CBot/TestCBot/test23.txt b/src/CBot/tests/TestCBot/scenarios/test23.txt
index d6e1ddd..d6e1ddd 100644
--- a/src/CBot/TestCBot/test23.txt
+++ b/src/CBot/tests/TestCBot/scenarios/test23.txt
diff --git a/src/CBot/TestCBot/testmw.txt b/src/CBot/tests/TestCBot/scenarios/testmw.txt
index 6570f6d..6570f6d 100644
--- a/src/CBot/TestCBot/testmw.txt
+++ b/src/CBot/tests/TestCBot/scenarios/testmw.txt
diff --git a/src/CBot/TestCBot/this.txt b/src/CBot/tests/TestCBot/scenarios/this.txt
index b8a9e04..b8a9e04 100644
--- a/src/CBot/TestCBot/this.txt
+++ b/src/CBot/tests/TestCBot/scenarios/this.txt
diff --git a/src/CBot/TestCBot/tt.txt b/src/CBot/tests/TestCBot/scenarios/tt.txt
index cd13c9d..cd13c9d 100644
--- a/src/CBot/TestCBot/tt.txt
+++ b/src/CBot/tests/TestCBot/scenarios/tt.txt
diff --git a/src/CBot/TestCBot/tt2.txt b/src/CBot/tests/TestCBot/scenarios/tt2.txt
index ad9dc1d..ad9dc1d 100644
--- a/src/CBot/TestCBot/tt2.txt
+++ b/src/CBot/tests/TestCBot/scenarios/tt2.txt
diff --git a/src/CBot/TestCBot/vide.txt b/src/CBot/tests/TestCBot/scenarios/vide.txt
index e69de29..e69de29 100644
--- a/src/CBot/TestCBot/vide.txt
+++ b/src/CBot/tests/TestCBot/scenarios/vide.txt
diff --git a/src/CBot/TestCBot/zz.txt b/src/CBot/tests/TestCBot/scenarios/zz.txt
index da764ac..da764ac 100644
--- a/src/CBot/TestCBot/zz.txt
+++ b/src/CBot/tests/TestCBot/scenarios/zz.txt
diff --git a/src/CBot/TestCBot/xTestCBot.clw b/src/CBot/tests/TestCBot/xTestCBot.clw
index 5b84c16..5b84c16 100644
--- a/src/CBot/TestCBot/xTestCBot.clw
+++ b/src/CBot/tests/TestCBot/xTestCBot.clw
diff --git a/src/CBot/old TstCBot/BotConsoleDlg.cpp b/src/CBot/tests/old TstCBot/BotConsoleDlg.cpp
index 077f080..077f080 100644
--- a/src/CBot/old TstCBot/BotConsoleDlg.cpp
+++ b/src/CBot/tests/old TstCBot/BotConsoleDlg.cpp
diff --git a/src/CBot/old TstCBot/BotConsoleDlg.h b/src/CBot/tests/old TstCBot/BotConsoleDlg.h
index 9b54ff2..9b54ff2 100644
--- a/src/CBot/old TstCBot/BotConsoleDlg.h
+++ b/src/CBot/tests/old TstCBot/BotConsoleDlg.h
diff --git a/src/CBot/old TstCBot/BotErrorDlg.cpp b/src/CBot/tests/old TstCBot/BotErrorDlg.cpp
index 87d56f0..87d56f0 100644
--- a/src/CBot/old TstCBot/BotErrorDlg.cpp
+++ b/src/CBot/tests/old TstCBot/BotErrorDlg.cpp
diff --git a/src/CBot/old TstCBot/BotErrorDlg.h b/src/CBot/tests/old TstCBot/BotErrorDlg.h
index 522afad..522afad 100644
--- a/src/CBot/old TstCBot/BotErrorDlg.h
+++ b/src/CBot/tests/old TstCBot/BotErrorDlg.h
diff --git a/src/CBot/old TstCBot/CBotTest.txt b/src/CBot/tests/old TstCBot/CBotTest.txt
index ce20e26..ce20e26 100644
--- a/src/CBot/old TstCBot/CBotTest.txt
+++ b/src/CBot/tests/old TstCBot/CBotTest.txt
diff --git a/src/CBot/old TstCBot/CMyThread.cpp b/src/CBot/tests/old TstCBot/CMyThread.cpp
index ca92c77..ca92c77 100644
--- a/src/CBot/old TstCBot/CMyThread.cpp
+++ b/src/CBot/tests/old TstCBot/CMyThread.cpp
diff --git a/src/CBot/old TstCBot/CMyThread.h b/src/CBot/tests/old TstCBot/CMyThread.h
index 1134077..1134077 100644
--- a/src/CBot/old TstCBot/CMyThread.h
+++ b/src/CBot/tests/old TstCBot/CMyThread.h
diff --git a/src/CBot/old TstCBot/MainFrm.cpp b/src/CBot/tests/old TstCBot/MainFrm.cpp
index 6c0962c..6c0962c 100644
--- a/src/CBot/old TstCBot/MainFrm.cpp
+++ b/src/CBot/tests/old TstCBot/MainFrm.cpp
diff --git a/src/CBot/old TstCBot/MainFrm.h b/src/CBot/tests/old TstCBot/MainFrm.h
index 56b9c41..56b9c41 100644
--- a/src/CBot/old TstCBot/MainFrm.h
+++ b/src/CBot/tests/old TstCBot/MainFrm.h
diff --git a/src/CBot/old TstCBot/ReadMe.txt b/src/CBot/tests/old TstCBot/ReadMe.txt
index 67dc05b..67dc05b 100644
--- a/src/CBot/old TstCBot/ReadMe.txt
+++ b/src/CBot/tests/old TstCBot/ReadMe.txt
diff --git a/src/CBot/old TstCBot/Resource.h b/src/CBot/tests/old TstCBot/Resource.h
index 6863fd8..6863fd8 100644
--- a/src/CBot/old TstCBot/Resource.h
+++ b/src/CBot/tests/old TstCBot/Resource.h
diff --git a/src/CBot/old TstCBot/StdAfx.cpp b/src/CBot/tests/old TstCBot/StdAfx.cpp
index ae0ec93..ae0ec93 100644
--- a/src/CBot/old TstCBot/StdAfx.cpp
+++ b/src/CBot/tests/old TstCBot/StdAfx.cpp
diff --git a/src/CBot/old TstCBot/StdAfx.h b/src/CBot/tests/old TstCBot/StdAfx.h
index 7d46ace..7d46ace 100644
--- a/src/CBot/old TstCBot/StdAfx.h
+++ b/src/CBot/tests/old TstCBot/StdAfx.h
diff --git a/src/CBot/old TstCBot/TstCBot.clw b/src/CBot/tests/old TstCBot/TstCBot.clw
index 4c54168..4c54168 100644
--- a/src/CBot/old TstCBot/TstCBot.clw
+++ b/src/CBot/tests/old TstCBot/TstCBot.clw
diff --git a/src/CBot/old TstCBot/TstCBot.cpp b/src/CBot/tests/old TstCBot/TstCBot.cpp
index 8ac4557..8ac4557 100644
--- a/src/CBot/old TstCBot/TstCBot.cpp
+++ b/src/CBot/tests/old TstCBot/TstCBot.cpp
diff --git a/src/CBot/old TstCBot/TstCBot.dsp b/src/CBot/tests/old TstCBot/TstCBot.dsp
index 35e5c0b..35e5c0b 100644
--- a/src/CBot/old TstCBot/TstCBot.dsp
+++ b/src/CBot/tests/old TstCBot/TstCBot.dsp
diff --git a/src/CBot/old TstCBot/TstCBot.h b/src/CBot/tests/old TstCBot/TstCBot.h
index 616db43..616db43 100644
--- a/src/CBot/old TstCBot/TstCBot.h
+++ b/src/CBot/tests/old TstCBot/TstCBot.h
diff --git a/src/CBot/old TstCBot/TstCBot.rc b/src/CBot/tests/old TstCBot/TstCBot.rc
index 9e91c76..9e91c76 100644
--- a/src/CBot/old TstCBot/TstCBot.rc
+++ b/src/CBot/tests/old TstCBot/TstCBot.rc
diff --git a/src/CBot/old TstCBot/TstCBotDoc.cpp b/src/CBot/tests/old TstCBot/TstCBotDoc.cpp
index 7d7e2ef..7d7e2ef 100644
--- a/src/CBot/old TstCBot/TstCBotDoc.cpp
+++ b/src/CBot/tests/old TstCBot/TstCBotDoc.cpp
diff --git a/src/CBot/old TstCBot/TstCBotDoc.h b/src/CBot/tests/old TstCBot/TstCBotDoc.h
index ae1d0f7..ae1d0f7 100644
--- a/src/CBot/old TstCBot/TstCBotDoc.h
+++ b/src/CBot/tests/old TstCBot/TstCBotDoc.h
diff --git a/src/CBot/old TstCBot/TstCBotView.cpp b/src/CBot/tests/old TstCBot/TstCBotView.cpp
index 3ee9094..3ee9094 100644
--- a/src/CBot/old TstCBot/TstCBotView.cpp
+++ b/src/CBot/tests/old TstCBot/TstCBotView.cpp
diff --git a/src/CBot/old TstCBot/TstCBotView.h b/src/CBot/tests/old TstCBot/TstCBotView.h
index d5aede5..d5aede5 100644
--- a/src/CBot/old TstCBot/TstCBotView.h
+++ b/src/CBot/tests/old TstCBot/TstCBotView.h
diff --git a/src/CBot/old TstCBot/res/TstCBot.ico b/src/CBot/tests/old TstCBot/res/TstCBot.ico
index 7eef0bc..7eef0bc 100644
--- a/src/CBot/old TstCBot/res/TstCBot.ico
+++ b/src/CBot/tests/old TstCBot/res/TstCBot.ico
diff --git a/src/CBot/old TstCBot/res/TstCBot.rc2 b/src/CBot/tests/old TstCBot/res/TstCBot.rc2
index 2186272..2186272 100644
--- a/src/CBot/old TstCBot/res/TstCBot.rc2
+++ b/src/CBot/tests/old TstCBot/res/TstCBot.rc2
diff --git a/src/CBot/old TstCBot/res/TstCBotDoc.ico b/src/CBot/tests/old TstCBot/res/TstCBotDoc.ico
index 2a1f1ae..2a1f1ae 100644
--- a/src/CBot/old TstCBot/res/TstCBotDoc.ico
+++ b/src/CBot/tests/old TstCBot/res/TstCBotDoc.ico
diff --git a/src/CBot/old TstCBot/test complet 1.txt b/src/CBot/tests/old TstCBot/test complet 1.txt
index 0fd4fa5..0fd4fa5 100644
--- a/src/CBot/old TstCBot/test complet 1.txt
+++ b/src/CBot/tests/old TstCBot/test complet 1.txt
diff --git a/src/CBot/old TstCBot/x.txt b/src/CBot/tests/old TstCBot/x.txt
index 95856e0..95856e0 100644
--- a/src/CBot/old TstCBot/x.txt
+++ b/src/CBot/tests/old TstCBot/x.txt