[colobot] 140/377: Change CBot default include directory. Make all include directive absolute.
Didier Raboud
odyx at moszumanska.debian.org
Wed Mar 30 13:34:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit de5a57f793fb10a578775d6513f6f01637bb8df7
Author: Grunaka <dev at romainbreton.fr>
Date: Mon Nov 23 21:59:56 2015 +0100
Change CBot default include directory. Make all include directive absolute.
---
src/CBot/CBotCStack.cpp | 10 +++----
src/CBot/CBotCStack.h | 2 +-
src/CBot/CBotCall.cpp | 12 ++++----
src/CBot/CBotCall.h | 2 +-
src/CBot/CBotCallMethode.cpp | 10 +++----
src/CBot/CBotCallMethode.h | 4 +--
src/CBot/CBotClass.cpp | 36 ++++++++++++------------
src/CBot/CBotClass.h | 6 ++--
src/CBot/CBotDefParam.cpp | 8 +++---
src/CBot/CBotDefParam.h | 4 +--
src/CBot/CBotFileUtils.cpp | 8 +++---
src/CBot/CBotInstr/CBotBlock.cpp | 8 +++---
src/CBot/CBotInstr/CBotBlock.h | 2 +-
src/CBot/CBotInstr/CBotBoolExpr.cpp | 8 +++---
src/CBot/CBotInstr/CBotBoolExpr.h | 2 +-
src/CBot/CBotInstr/CBotBoolean.cpp | 14 +++++-----
src/CBot/CBotInstr/CBotBoolean.h | 2 +-
src/CBot/CBotInstr/CBotBreak.cpp | 6 ++--
src/CBot/CBotInstr/CBotBreak.h | 2 +-
src/CBot/CBotInstr/CBotCase.cpp | 8 +++---
src/CBot/CBotInstr/CBotCase.h | 2 +-
src/CBot/CBotInstr/CBotCatch.cpp | 12 ++++----
src/CBot/CBotInstr/CBotCatch.h | 2 +-
src/CBot/CBotInstr/CBotClassInst.cpp | 18 ++++++------
src/CBot/CBotInstr/CBotClassInst.h | 2 +-
src/CBot/CBotInstr/CBotCondition.cpp | 8 +++---
src/CBot/CBotInstr/CBotCondition.h | 2 +-
src/CBot/CBotInstr/CBotDo.cpp | 10 +++----
src/CBot/CBotInstr/CBotDo.h | 2 +-
src/CBot/CBotInstr/CBotEmpty.cpp | 6 ++--
src/CBot/CBotInstr/CBotEmpty.h | 2 +-
src/CBot/CBotInstr/CBotExprAlpha.cpp | 8 +++---
src/CBot/CBotInstr/CBotExprAlpha.h | 2 +-
src/CBot/CBotInstr/CBotExprBool.cpp | 8 +++---
src/CBot/CBotInstr/CBotExprBool.h | 2 +-
src/CBot/CBotInstr/CBotExprNan.cpp | 6 ++--
src/CBot/CBotInstr/CBotExprNan.h | 2 +-
src/CBot/CBotInstr/CBotExprNull.cpp | 6 ++--
src/CBot/CBotInstr/CBotExprNull.h | 2 +-
src/CBot/CBotInstr/CBotExprNum.cpp | 8 +++---
src/CBot/CBotInstr/CBotExprNum.h | 2 +-
src/CBot/CBotInstr/CBotExprUnaire.cpp | 10 +++----
src/CBot/CBotInstr/CBotExprUnaire.h | 2 +-
src/CBot/CBotInstr/CBotExprVar.cpp | 16 +++++------
src/CBot/CBotInstr/CBotExprVar.h | 4 +--
src/CBot/CBotInstr/CBotExpression.cpp | 12 ++++----
src/CBot/CBotInstr/CBotExpression.h | 4 +--
src/CBot/CBotInstr/CBotFieldExpr.cpp | 10 +++----
src/CBot/CBotInstr/CBotFieldExpr.h | 2 +-
src/CBot/CBotInstr/CBotFloat.cpp | 14 +++++-----
src/CBot/CBotInstr/CBotFloat.h | 2 +-
src/CBot/CBotInstr/CBotFor.cpp | 12 ++++----
src/CBot/CBotInstr/CBotFor.h | 2 +-
src/CBot/CBotInstr/CBotFunction.cpp | 26 ++++++++---------
src/CBot/CBotInstr/CBotFunction.h | 2 +-
src/CBot/CBotInstr/CBotIString.cpp | 12 ++++----
src/CBot/CBotInstr/CBotIString.h | 2 +-
src/CBot/CBotInstr/CBotIf.cpp | 10 +++----
src/CBot/CBotInstr/CBotIf.h | 2 +-
src/CBot/CBotInstr/CBotIndexExpr.cpp | 8 +++---
src/CBot/CBotInstr/CBotIndexExpr.h | 2 +-
src/CBot/CBotInstr/CBotInstArray.cpp | 18 ++++++------
src/CBot/CBotInstr/CBotInstArray.h | 2 +-
src/CBot/CBotInstr/CBotInstr.cpp | 46 +++++++++++++++----------------
src/CBot/CBotInstr/CBotInstr.h | 4 +--
src/CBot/CBotInstr/CBotInstrCall.cpp | 8 +++---
src/CBot/CBotInstr/CBotInstrCall.h | 2 +-
src/CBot/CBotInstr/CBotInstrMethode.cpp | 12 ++++----
src/CBot/CBotInstr/CBotInstrMethode.h | 2 +-
src/CBot/CBotInstr/CBotInstrUtils.cpp | 14 +++++-----
src/CBot/CBotInstr/CBotInt.cpp | 14 +++++-----
src/CBot/CBotInstr/CBotInt.h | 2 +-
src/CBot/CBotInstr/CBotLeftExpr.cpp | 16 +++++------
src/CBot/CBotInstr/CBotLeftExpr.h | 2 +-
src/CBot/CBotInstr/CBotLeftExprVar.cpp | 8 +++---
src/CBot/CBotInstr/CBotLeftExprVar.h | 2 +-
src/CBot/CBotInstr/CBotListArray.cpp | 14 +++++-----
src/CBot/CBotInstr/CBotListArray.h | 2 +-
src/CBot/CBotInstr/CBotListExpression.cpp | 14 +++++-----
src/CBot/CBotInstr/CBotListExpression.h | 2 +-
src/CBot/CBotInstr/CBotListInstr.cpp | 8 +++---
src/CBot/CBotInstr/CBotListInstr.h | 2 +-
src/CBot/CBotInstr/CBotLogicExpr.cpp | 4 +--
src/CBot/CBotInstr/CBotLogicExpr.h | 2 +-
src/CBot/CBotInstr/CBotNew.cpp | 12 ++++----
src/CBot/CBotInstr/CBotNew.h | 2 +-
src/CBot/CBotInstr/CBotParExpr.cpp | 34 +++++++++++------------
src/CBot/CBotInstr/CBotParExpr.h | 2 +-
src/CBot/CBotInstr/CBotPostIncExpr.cpp | 8 +++---
src/CBot/CBotInstr/CBotPostIncExpr.h | 2 +-
src/CBot/CBotInstr/CBotPreIncExpr.cpp | 8 +++---
src/CBot/CBotInstr/CBotPreIncExpr.h | 2 +-
src/CBot/CBotInstr/CBotReturn.cpp | 10 +++----
src/CBot/CBotInstr/CBotReturn.h | 2 +-
src/CBot/CBotInstr/CBotSwitch.cpp | 12 ++++----
src/CBot/CBotInstr/CBotSwitch.h | 2 +-
src/CBot/CBotInstr/CBotThrow.cpp | 8 +++---
src/CBot/CBotInstr/CBotThrow.h | 2 +-
src/CBot/CBotInstr/CBotTry.cpp | 6 ++--
src/CBot/CBotInstr/CBotTry.h | 4 +--
src/CBot/CBotInstr/CBotTwoOpExpr.cpp | 16 +++++------
src/CBot/CBotInstr/CBotTwoOpExpr.h | 2 +-
src/CBot/CBotInstr/CBotWhile.cpp | 10 +++----
src/CBot/CBotInstr/CBotWhile.h | 2 +-
src/CBot/CBotProgram.cpp | 16 +++++------
src/CBot/CBotProgram.h | 8 +++---
src/CBot/CBotStack.cpp | 12 ++++----
src/CBot/CBotStack.h | 6 ++--
src/CBot/CBotString.cpp | 2 +-
src/CBot/CBotString.h | 4 +--
src/CBot/CBotStringArray.cpp | 4 +--
src/CBot/CBotStringArray.h | 2 +-
src/CBot/CBotToken.cpp | 2 +-
src/CBot/CBotToken.h | 2 +-
src/CBot/CBotTypResult.cpp | 6 ++--
src/CBot/CBotUtils.cpp | 12 ++++----
src/CBot/CBotUtils.h | 4 +--
src/CBot/CBotVar/CBotVar.cpp | 22 +++++++--------
src/CBot/CBotVar/CBotVar.h | 4 +--
src/CBot/CBotVar/CBotVarArray.cpp | 10 +++----
src/CBot/CBotVar/CBotVarArray.h | 4 +--
src/CBot/CBotVar/CBotVarBoolean.cpp | 6 ++--
src/CBot/CBotVar/CBotVarBoolean.h | 4 +--
src/CBot/CBotVar/CBotVarClass.cpp | 12 ++++----
src/CBot/CBotVar/CBotVarClass.h | 2 +-
src/CBot/CBotVar/CBotVarFloat.cpp | 8 +++---
src/CBot/CBotVar/CBotVarFloat.h | 2 +-
src/CBot/CBotVar/CBotVarInt.cpp | 8 +++---
src/CBot/CBotVar/CBotVarInt.h | 2 +-
src/CBot/CBotVar/CBotVarPointer.cpp | 12 ++++----
src/CBot/CBotVar/CBotVarPointer.h | 2 +-
src/CBot/CBotVar/CBotVarString.cpp | 8 +++---
src/CBot/CBotVar/CBotVarString.h | 2 +-
src/CBot/CMakeLists.txt | 2 +-
src/CBot/StringFunctions.cpp | 8 +++---
src/CBot/StringFunctions.h | 2 +-
136 files changed, 483 insertions(+), 483 deletions(-)
diff --git a/src/CBot/CBotCStack.cpp b/src/CBot/CBotCStack.cpp
index 6d9b820..ed56e22 100644
--- a/src/CBot/CBotCStack.cpp
+++ b/src/CBot/CBotCStack.cpp
@@ -19,14 +19,14 @@
// Modules inlcude
-#include "CBotCStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotToken.h"
-#include "CBotCall.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotCall.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
-#include "CBotInstr/CBotFunction.h"
+#include "CBot/CBotInstr/CBotFunction.h"
// Local include
diff --git a/src/CBot/CBotCStack.h b/src/CBot/CBotCStack.h
index 70ce456..e6210f8 100644
--- a/src/CBot/CBotCStack.h
+++ b/src/CBot/CBotCStack.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotProgram.h"
+#include "CBot/CBotProgram.h"
// Local include
diff --git a/src/CBot/CBotCall.cpp b/src/CBot/CBotCall.cpp
index ee853d8..13f1e85 100644
--- a/src/CBot/CBotCall.cpp
+++ b/src/CBot/CBotCall.cpp
@@ -18,14 +18,14 @@
*/
// Modules inlcude
-#include "CBotCall.h"
+#include "CBot/CBotCall.h"
-#include "CBotToken.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotUtils.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotUtils.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotCall.h b/src/CBot/CBotCall.h
index b4dc4fe..bb94c23 100644
--- a/src/CBot/CBotCall.h
+++ b/src/CBot/CBotCall.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotString.h"
+#include "CBot/CBotString.h"
// Local include
diff --git a/src/CBot/CBotCallMethode.cpp b/src/CBot/CBotCallMethode.cpp
index da915df..d38da85 100644
--- a/src/CBot/CBotCallMethode.cpp
+++ b/src/CBot/CBotCallMethode.cpp
@@ -18,13 +18,13 @@
*/
// Modules inlcude
-#include "CBotCallMethode.h"
+#include "CBot/CBotCallMethode.h"
-#include "CBotUtils.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotUtils.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotCallMethode.h b/src/CBot/CBotCallMethode.h
index d60a9b7..445e259 100644
--- a/src/CBot/CBotCallMethode.h
+++ b/src/CBot/CBotCallMethode.h
@@ -20,8 +20,8 @@
#pragma once
// Modules inlcude
-#include "CBotTypResult.h"
-#include "CBotString.h"
+#include "CBot/CBotTypResult.h"
+#include "CBot/CBotString.h"
// Local include
diff --git a/src/CBot/CBotClass.cpp b/src/CBot/CBotClass.cpp
index 172f2cd..8e580bb 100644
--- a/src/CBot/CBotClass.cpp
+++ b/src/CBot/CBotClass.cpp
@@ -18,24 +18,24 @@
*/
// Modules inlcude
-#include "CBotClass.h"
-
-#include "CBotInstr/CBotNew.h"
-#include "CBotInstr/CBotLeftExprVar.h"
-#include "CBotInstr/CBotTwoOpExpr.h"
-#include "CBotInstr/CBotFunction.h"
-#include "CBotInstr/CBotExpression.h"
-#include "CBotInstr/CBotListArray.h"
-#include "CBotInstr/CBotEmpty.h"
-
-#include "CBotCall.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotUtils.h"
-#include "CBotFileUtils.h"
-#include "CBotCallMethode.h"
-
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotClass.h"
+
+#include "CBot/CBotInstr/CBotNew.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotFunction.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotListArray.h"
+#include "CBot/CBotInstr/CBotEmpty.h"
+
+#include "CBot/CBotCall.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotUtils.h"
+#include "CBot/CBotFileUtils.h"
+#include "CBot/CBotCallMethode.h"
+
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotClass.h b/src/CBot/CBotClass.h
index ac9e418..2b151b0 100644
--- a/src/CBot/CBotClass.h
+++ b/src/CBot/CBotClass.h
@@ -20,11 +20,11 @@
#pragma once
// Modules inlcude
-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"
-#include "CBotTypResult.h"
+#include "CBot/CBotTypResult.h"
-#include "CBotString.h"
+#include "CBot/CBotString.h"
// Local include
diff --git a/src/CBot/CBotDefParam.cpp b/src/CBot/CBotDefParam.cpp
index fe7ce8b..7f13f89 100644
--- a/src/CBot/CBotDefParam.cpp
+++ b/src/CBot/CBotDefParam.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotDefParam.h"
+#include "CBot/CBotDefParam.h"
-#include "CBotUtils.h"
-#include "CBotCStack.h"
+#include "CBot/CBotUtils.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarClass.h"
// Local include
diff --git a/src/CBot/CBotDefParam.h b/src/CBot/CBotDefParam.h
index 6da8e2c..433d18f 100644
--- a/src/CBot/CBotDefParam.h
+++ b/src/CBot/CBotDefParam.h
@@ -20,8 +20,8 @@
#pragma once
// Modules inlcude
-#include "CBotToken.h"
-#include "CBotStack.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotStack.h"
// Local include
diff --git a/src/CBot/CBotFileUtils.cpp b/src/CBot/CBotFileUtils.cpp
index 79a1240..c6e50e1 100644
--- a/src/CBot/CBotFileUtils.cpp
+++ b/src/CBot/CBotFileUtils.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotFileUtils.h"
+#include "CBot/CBotFileUtils.h"
-#include "CBotString.h"
-#include "CBotClass.h"
+#include "CBot/CBotString.h"
+#include "CBot/CBotClass.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBlock.cpp b/src/CBot/CBotInstr/CBotBlock.cpp
index 648c5ac..9e6b253 100644
--- a/src/CBot/CBotInstr/CBotBlock.cpp
+++ b/src/CBot/CBotInstr/CBotBlock.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotBlock.h"
+#include "CBot/CBotInstr/CBotBlock.h"
-#include "CBotCStack.h"
-#include "CBotListInstr.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotInstr/CBotListInstr.h"
-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBlock.h b/src/CBot/CBotInstr/CBotBlock.h
index 7df0bb5..c88e500 100644
--- a/src/CBot/CBotInstr/CBotBlock.h
+++ b/src/CBot/CBotInstr/CBotBlock.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBoolExpr.cpp b/src/CBot/CBotInstr/CBotBoolExpr.cpp
index 873a1a6..e219d15 100644
--- a/src/CBot/CBotInstr/CBotBoolExpr.cpp
+++ b/src/CBot/CBotInstr/CBotBoolExpr.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotBoolExpr.h"
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotBoolExpr.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
-#include "CBotCStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBoolExpr.h b/src/CBot/CBotInstr/CBotBoolExpr.h
index af6cd4f..3154502 100644
--- a/src/CBot/CBotInstr/CBotBoolExpr.h
+++ b/src/CBot/CBotInstr/CBotBoolExpr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBoolean.cpp b/src/CBot/CBotInstr/CBotBoolean.cpp
index 64c4d3d..0b44d71 100644
--- a/src/CBot/CBotInstr/CBotBoolean.cpp
+++ b/src/CBot/CBotInstr/CBotBoolean.cpp
@@ -18,15 +18,15 @@
*/
// Modules inlcude
-#include "CBotBoolean.h"
-#include "CBotLeftExprVar.h"
-#include "CBotTwoOpExpr.h"
-#include "CBotInstArray.h"
+#include "CBot/CBotInstr/CBotBoolean.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotInstArray.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBoolean.h b/src/CBot/CBotInstr/CBotBoolean.h
index e589f50..78b4909 100644
--- a/src/CBot/CBotInstr/CBotBoolean.h
+++ b/src/CBot/CBotInstr/CBotBoolean.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBreak.cpp b/src/CBot/CBotInstr/CBotBreak.cpp
index 9d4100c..d97d65a 100644
--- a/src/CBot/CBotInstr/CBotBreak.cpp
+++ b/src/CBot/CBotInstr/CBotBreak.cpp
@@ -18,10 +18,10 @@
*/
// Modules inlcude
-#include "CBotBreak.h"
+#include "CBot/CBotInstr/CBotBreak.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBreak.h b/src/CBot/CBotInstr/CBotBreak.h
index 78b39dd..7961b0b 100644
--- a/src/CBot/CBotInstr/CBotBreak.h
+++ b/src/CBot/CBotInstr/CBotBreak.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotCase.cpp b/src/CBot/CBotInstr/CBotCase.cpp
index 3ae5b70..9387330 100644
--- a/src/CBot/CBotInstr/CBotCase.cpp
+++ b/src/CBot/CBotInstr/CBotCase.cpp
@@ -18,11 +18,11 @@
*/
// Modules inlcude
-#include "CBotCase.h"
-#include "CBotExprNum.h"
+#include "CBot/CBotInstr/CBotCase.h"
+#include "CBot/CBotInstr/CBotExprNum.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotCase.h b/src/CBot/CBotInstr/CBotCase.h
index 03ddddd..ebd6748 100644
--- a/src/CBot/CBotInstr/CBotCase.h
+++ b/src/CBot/CBotInstr/CBotCase.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotCatch.cpp b/src/CBot/CBotInstr/CBotCatch.cpp
index 26f7d17..f62f662 100644
--- a/src/CBot/CBotInstr/CBotCatch.cpp
+++ b/src/CBot/CBotInstr/CBotCatch.cpp
@@ -18,14 +18,14 @@
*/
// Modules inlcude
-#include "CBotCatch.h"
-#include "CBotBlock.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotCatch.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotExpression.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotCatch.h b/src/CBot/CBotInstr/CBotCatch.h
index 60ee00a..eec4196 100644
--- a/src/CBot/CBotInstr/CBotCatch.h
+++ b/src/CBot/CBotInstr/CBotCatch.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotClassInst.cpp b/src/CBot/CBotInstr/CBotClassInst.cpp
index d556dd7..d66ba3e 100644
--- a/src/CBot/CBotInstr/CBotClassInst.cpp
+++ b/src/CBot/CBotInstr/CBotClassInst.cpp
@@ -20,18 +20,18 @@
// Modules inlcude
#include "CBotClassInst.h"
-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"
-#include "CBotLeftExprVar.h"
-#include "CBotTwoOpExpr.h"
-#include "CBotInstArray.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotInstArray.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"
-#include "CBotVar/CBotVarPointer.h"
-#include "CBotVar/CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarPointer.h"
+#include "CBot/CBotVar/CBotVarClass.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotClassInst.h b/src/CBot/CBotInstr/CBotClassInst.h
index ab70c0f..743e39e 100644
--- a/src/CBot/CBotInstr/CBotClassInst.h
+++ b/src/CBot/CBotInstr/CBotClassInst.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotCondition.cpp b/src/CBot/CBotInstr/CBotCondition.cpp
index 6c5e53d..6c88869 100644
--- a/src/CBot/CBotInstr/CBotCondition.cpp
+++ b/src/CBot/CBotInstr/CBotCondition.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotCondition.h"
-#include "CBotBoolExpr.h"
+#include "CBot/CBotInstr/CBotCondition.h"
+#include "CBot/CBotInstr/CBotBoolExpr.h"
-#include "CBotCStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotCondition.h b/src/CBot/CBotInstr/CBotCondition.h
index f36c998..334354f 100644
--- a/src/CBot/CBotInstr/CBotCondition.h
+++ b/src/CBot/CBotInstr/CBotCondition.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotDo.cpp b/src/CBot/CBotInstr/CBotDo.cpp
index c24baff..ef682b3 100644
--- a/src/CBot/CBotInstr/CBotDo.cpp
+++ b/src/CBot/CBotInstr/CBotDo.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotDo.h"
-#include "CBotBlock.h"
-#include "CBotCondition.h"
+#include "CBot/CBotInstr/CBotDo.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotCondition.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotDo.h b/src/CBot/CBotInstr/CBotDo.h
index 30f1db9..8a80040 100644
--- a/src/CBot/CBotInstr/CBotDo.h
+++ b/src/CBot/CBotInstr/CBotDo.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotEmpty.cpp b/src/CBot/CBotInstr/CBotEmpty.cpp
index 4318ead..ba9a9fd 100644
--- a/src/CBot/CBotInstr/CBotEmpty.cpp
+++ b/src/CBot/CBotInstr/CBotEmpty.cpp
@@ -18,11 +18,11 @@
*/
// Modules inlcude
-#include "CBotEmpty.h"
+#include "CBot/CBotInstr/CBotEmpty.h"
-#include "CBotStack.h"
+#include "CBot/CBotStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotEmpty.h b/src/CBot/CBotInstr/CBotEmpty.h
index 782e87c..ebbee7b 100644
--- a/src/CBot/CBotInstr/CBotEmpty.h
+++ b/src/CBot/CBotInstr/CBotEmpty.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprAlpha.cpp b/src/CBot/CBotInstr/CBotExprAlpha.cpp
index 1f93b89..da68497 100644
--- a/src/CBot/CBotInstr/CBotExprAlpha.cpp
+++ b/src/CBot/CBotInstr/CBotExprAlpha.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotExprAlpha.h"
+#include "CBot/CBotInstr/CBotExprAlpha.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprAlpha.h b/src/CBot/CBotInstr/CBotExprAlpha.h
index 01e97a8..10f4e24 100644
--- a/src/CBot/CBotInstr/CBotExprAlpha.h
+++ b/src/CBot/CBotInstr/CBotExprAlpha.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprBool.cpp b/src/CBot/CBotInstr/CBotExprBool.cpp
index 3df5095..9473693 100644
--- a/src/CBot/CBotInstr/CBotExprBool.cpp
+++ b/src/CBot/CBotInstr/CBotExprBool.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotExprBool.h"
+#include "CBot/CBotInstr/CBotExprBool.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprBool.h b/src/CBot/CBotInstr/CBotExprBool.h
index a81ec2e..ac1d84f 100644
--- a/src/CBot/CBotInstr/CBotExprBool.h
+++ b/src/CBot/CBotInstr/CBotExprBool.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprNan.cpp b/src/CBot/CBotInstr/CBotExprNan.cpp
index a2cb1c6..df0a296 100644
--- a/src/CBot/CBotInstr/CBotExprNan.cpp
+++ b/src/CBot/CBotInstr/CBotExprNan.cpp
@@ -18,11 +18,11 @@
*/
// Modules inlcude
-#include "CBotExprNan.h"
+#include "CBot/CBotInstr/CBotExprNan.h"
-#include "CBotStack.h"
+#include "CBot/CBotStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprNan.h b/src/CBot/CBotInstr/CBotExprNan.h
index c7c2596..623502a 100644
--- a/src/CBot/CBotInstr/CBotExprNan.h
+++ b/src/CBot/CBotInstr/CBotExprNan.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprNull.cpp b/src/CBot/CBotInstr/CBotExprNull.cpp
index cef5eca..a36b488 100644
--- a/src/CBot/CBotInstr/CBotExprNull.cpp
+++ b/src/CBot/CBotInstr/CBotExprNull.cpp
@@ -18,11 +18,11 @@
*/
// Modules inlcude
-#include "CBotExprNull.h"
+#include "CBot/CBotInstr/CBotExprNull.h"
-#include "CBotStack.h"
+#include "CBot/CBotStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprNull.h b/src/CBot/CBotInstr/CBotExprNull.h
index 662ded3..473ddb6 100644
--- a/src/CBot/CBotInstr/CBotExprNull.h
+++ b/src/CBot/CBotInstr/CBotExprNull.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprNum.cpp b/src/CBot/CBotInstr/CBotExprNum.cpp
index acf1e9a..e9a72de 100644
--- a/src/CBot/CBotInstr/CBotExprNum.cpp
+++ b/src/CBot/CBotInstr/CBotExprNum.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotExprNum.h"
+#include "CBot/CBotInstr/CBotExprNum.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprNum.h b/src/CBot/CBotInstr/CBotExprNum.h
index e9ccf93..7195f7b 100644
--- a/src/CBot/CBotInstr/CBotExprNum.h
+++ b/src/CBot/CBotInstr/CBotExprNum.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprUnaire.cpp b/src/CBot/CBotInstr/CBotExprUnaire.cpp
index 31056bb..50e39a7 100644
--- a/src/CBot/CBotInstr/CBotExprUnaire.cpp
+++ b/src/CBot/CBotInstr/CBotExprUnaire.cpp
@@ -18,13 +18,13 @@
*/
// Modules inlcude
-#include "CBotExprUnaire.h"
-#include "CBotParExpr.h"
+#include "CBot/CBotInstr/CBotExprUnaire.h"
+#include "CBot/CBotInstr/CBotParExpr.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprUnaire.h b/src/CBot/CBotInstr/CBotExprUnaire.h
index 660afdd..b015f34 100644
--- a/src/CBot/CBotInstr/CBotExprUnaire.h
+++ b/src/CBot/CBotInstr/CBotExprUnaire.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprVar.cpp b/src/CBot/CBotInstr/CBotExprVar.cpp
index ee4a748..4dc078d 100644
--- a/src/CBot/CBotInstr/CBotExprVar.cpp
+++ b/src/CBot/CBotInstr/CBotExprVar.cpp
@@ -18,16 +18,16 @@
*/
// Modules inlcude
-#include "CBotExprVar.h"
-#include "CBotInstrMethode.h"
-#include "CBotExpression.h"
-#include "CBotIndexExpr.h"
-#include "CBotFieldExpr.h"
+#include "CBot/CBotInstr/CBotExprVar.h"
+#include "CBot/CBotInstr/CBotInstrMethode.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotIndexExpr.h"
+#include "CBot/CBotInstr/CBotFieldExpr.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVarArray.h"
+#include "CBot/CBotVar/CBotVarArray.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprVar.h b/src/CBot/CBotInstr/CBotExprVar.h
index 9757b89..ff5cf17 100644
--- a/src/CBot/CBotInstr/CBotExprVar.h
+++ b/src/CBot/CBotInstr/CBotExprVar.h
@@ -20,9 +20,9 @@
#pragma once
// Modules inlcude
-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExpression.cpp b/src/CBot/CBotInstr/CBotExpression.cpp
index a361242..d3821aa 100644
--- a/src/CBot/CBotInstr/CBotExpression.cpp
+++ b/src/CBot/CBotInstr/CBotExpression.cpp
@@ -18,16 +18,16 @@
*/
// Modules inlcude
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotExpression.h"
-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExpression.h b/src/CBot/CBotInstr/CBotExpression.h
index 637ff05..a854d8b 100644
--- a/src/CBot/CBotInstr/CBotExpression.h
+++ b/src/CBot/CBotInstr/CBotExpression.h
@@ -20,9 +20,9 @@
#pragma once
// Modules inlcude
-#include "CBotLeftExpr.h"
+#include "CBot/CBotInstr/CBotLeftExpr.h"
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFieldExpr.cpp b/src/CBot/CBotInstr/CBotFieldExpr.cpp
index 7c4ff58..c581769 100644
--- a/src/CBot/CBotInstr/CBotFieldExpr.cpp
+++ b/src/CBot/CBotInstr/CBotFieldExpr.cpp
@@ -18,13 +18,13 @@
*/
// Modules inlcude
-#include "CBotFieldExpr.h"
+#include "CBot/CBotInstr/CBotFieldExpr.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"
-#include "CBotVar/CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarClass.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFieldExpr.h b/src/CBot/CBotInstr/CBotFieldExpr.h
index 4a56a3f..84c014f 100644
--- a/src/CBot/CBotInstr/CBotFieldExpr.h
+++ b/src/CBot/CBotInstr/CBotFieldExpr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFloat.cpp b/src/CBot/CBotInstr/CBotFloat.cpp
index df69b07..f4a8ac3 100644
--- a/src/CBot/CBotInstr/CBotFloat.cpp
+++ b/src/CBot/CBotInstr/CBotFloat.cpp
@@ -18,15 +18,15 @@
*/
// Modules inlcude
-#include "CBotFloat.h"
-#include "CBotLeftExprVar.h"
-#include "CBotTwoOpExpr.h"
-#include "CBotInstArray.h"
+#include "CBot/CBotInstr/CBotFloat.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotInstArray.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFloat.h b/src/CBot/CBotInstr/CBotFloat.h
index 3e095fe..fa1d6f6 100644
--- a/src/CBot/CBotInstr/CBotFloat.h
+++ b/src/CBot/CBotInstr/CBotFloat.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFor.cpp b/src/CBot/CBotInstr/CBotFor.cpp
index 2a97b86..e225b99 100644
--- a/src/CBot/CBotInstr/CBotFor.cpp
+++ b/src/CBot/CBotInstr/CBotFor.cpp
@@ -18,13 +18,13 @@
*/
// Modules inlcude
-#include "CBotFor.h"
-#include "CBotListExpression.h"
-#include "CBotBlock.h"
-#include "CBotBoolExpr.h"
+#include "CBot/CBotInstr/CBotFor.h"
+#include "CBot/CBotInstr/CBotListExpression.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotBoolExpr.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFor.h b/src/CBot/CBotInstr/CBotFor.h
index 56442b0..5b9a93e 100644
--- a/src/CBot/CBotInstr/CBotFor.h
+++ b/src/CBot/CBotInstr/CBotFor.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFunction.cpp b/src/CBot/CBotInstr/CBotFunction.cpp
index f8e4b6d..7277486 100644
--- a/src/CBot/CBotInstr/CBotFunction.cpp
+++ b/src/CBot/CBotInstr/CBotFunction.cpp
@@ -19,23 +19,23 @@
// Modules inlcude
-#include "CBotFunction.h"
+#include "CBot/CBotInstr/CBotFunction.h"
-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"
-#include "CBotInstr/CBotBlock.h"
-#include "CBotInstr/CBotTwoOpExpr.h"
-#include "CBotInstr/CBotExpression.h"
-#include "CBotInstr/CBotEmpty.h"
-#include "CBotInstr/CBotListArray.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotEmpty.h"
+#include "CBot/CBotInstr/CBotListArray.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
-#include "CBotDefParam.h"
-#include "CBotUtils.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"
+#include "CBot/CBotDefParam.h"
+#include "CBot/CBotUtils.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFunction.h b/src/CBot/CBotInstr/CBotFunction.h
index 7c44dc3..f11015f 100644
--- a/src/CBot/CBotInstr/CBotFunction.h
+++ b/src/CBot/CBotInstr/CBotFunction.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotIString.cpp b/src/CBot/CBotInstr/CBotIString.cpp
index 6feefc4..be03c6e 100644
--- a/src/CBot/CBotInstr/CBotIString.cpp
+++ b/src/CBot/CBotInstr/CBotIString.cpp
@@ -18,14 +18,14 @@
*/
// Modules inlcude
-#include "CBotIString.h"
-#include "CBotLeftExprVar.h"
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotIString.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotIString.h b/src/CBot/CBotInstr/CBotIString.h
index 1435bb3..93fcfbd 100644
--- a/src/CBot/CBotInstr/CBotIString.h
+++ b/src/CBot/CBotInstr/CBotIString.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotIf.cpp b/src/CBot/CBotInstr/CBotIf.cpp
index 1075f65..784b88f 100644
--- a/src/CBot/CBotInstr/CBotIf.cpp
+++ b/src/CBot/CBotInstr/CBotIf.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotIf.h"
-#include "CBotInstr/CBotBlock.h"
-#include "CBotInstr/CBotCondition.h"
+#include "CBot/CBotInstr/CBotIf.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotCondition.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotIf.h b/src/CBot/CBotInstr/CBotIf.h
index de4c367..41c533d 100644
--- a/src/CBot/CBotInstr/CBotIf.h
+++ b/src/CBot/CBotInstr/CBotIf.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotIndexExpr.cpp b/src/CBot/CBotInstr/CBotIndexExpr.cpp
index 471089c..27784c5 100644
--- a/src/CBot/CBotInstr/CBotIndexExpr.cpp
+++ b/src/CBot/CBotInstr/CBotIndexExpr.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotIndexExpr.h"
+#include "CBot/CBotInstr/CBotIndexExpr.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVarArray.h"
+#include "CBot/CBotVar/CBotVarArray.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotIndexExpr.h b/src/CBot/CBotInstr/CBotIndexExpr.h
index fe1ea55..89f3964 100644
--- a/src/CBot/CBotInstr/CBotIndexExpr.h
+++ b/src/CBot/CBotInstr/CBotIndexExpr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstArray.cpp b/src/CBot/CBotInstr/CBotInstArray.cpp
index 7d2a441..b5497f3 100644
--- a/src/CBot/CBotInstr/CBotInstArray.cpp
+++ b/src/CBot/CBotInstr/CBotInstArray.cpp
@@ -18,19 +18,19 @@
*/
// Modules inlcude
-#include "CBotInstArray.h"
+#include "CBot/CBotInstr/CBotInstArray.h"
-#include "CBotLeftExprVar.h"
-#include "CBotExpression.h"
-#include "CBotListArray.h"
-#include "CBotEmpty.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotListArray.h"
+#include "CBot/CBotInstr/CBotEmpty.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstArray.h b/src/CBot/CBotInstr/CBotInstArray.h
index 2b02c66..217cab6 100644
--- a/src/CBot/CBotInstr/CBotInstArray.h
+++ b/src/CBot/CBotInstr/CBotInstArray.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstr.cpp b/src/CBot/CBotInstr/CBotInstr.cpp
index 7d376f7..9d6aac3 100644
--- a/src/CBot/CBotInstr/CBotInstr.cpp
+++ b/src/CBot/CBotInstr/CBotInstr.cpp
@@ -18,29 +18,29 @@
*/
// Modules inlcude
-#include "CBotInstr.h"
-
-#include "CBotInstr/CBotFor.h"
-#include "CBotInstr/CBotDo.h"
-#include "CBotInstr/CBotBreak.h"
-#include "CBotInstr/CBotSwitch.h"
-#include "CBotInstr/CBotTry.h"
-#include "CBotInstr/CBotThrow.h"
-#include "CBotInstr/CBotInt.h"
-#include "CBotInstr/CBotFloat.h"
-#include "CBotInstr/CBotWhile.h"
-#include "CBotInstr/CBotIString.h"
-#include "CBotInstr/CBotBoolean.h"
-#include "CBotInstr/CBotIf.h"
-#include "CBotInstr/CBotReturn.h"
-#include "CBotInstr/CBotClassInst.h"
-#include "CBotInstr/CBotExpression.h"
-#include "CBotInstr/CBotInstArray.h"
-
-#include "CBotVar/CBotVar.h"
-
-#include "CBotClass.h"
-#include "CBotStack.h"
+#include "CBot/CBotInstr/CBotInstr.h"
+
+#include "CBot/CBotInstr/CBotFor.h"
+#include "CBot/CBotInstr/CBotDo.h"
+#include "CBot/CBotInstr/CBotBreak.h"
+#include "CBot/CBotInstr/CBotSwitch.h"
+#include "CBot/CBotInstr/CBotTry.h"
+#include "CBot/CBotInstr/CBotThrow.h"
+#include "CBot/CBotInstr/CBotInt.h"
+#include "CBot/CBotInstr/CBotFloat.h"
+#include "CBot/CBotInstr/CBotWhile.h"
+#include "CBot/CBotInstr/CBotIString.h"
+#include "CBot/CBotInstr/CBotBoolean.h"
+#include "CBot/CBotInstr/CBotIf.h"
+#include "CBot/CBotInstr/CBotReturn.h"
+#include "CBot/CBotInstr/CBotClassInst.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotInstArray.h"
+
+#include "CBot/CBotVar/CBotVar.h"
+
+#include "CBot/CBotClass.h"
+#include "CBot/CBotStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstr.h b/src/CBot/CBotInstr/CBotInstr.h
index 1f25115..acf3678 100644
--- a/src/CBot/CBotInstr/CBotInstr.h
+++ b/src/CBot/CBotInstr/CBotInstr.h
@@ -20,9 +20,9 @@
#pragma once
// Modules inlcude
-#include "CBotToken.h"
+#include "CBot/CBotToken.h"
-#include "CBotCStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstrCall.cpp b/src/CBot/CBotInstr/CBotInstrCall.cpp
index ca21b87..d83f2a8 100644
--- a/src/CBot/CBotInstr/CBotInstrCall.cpp
+++ b/src/CBot/CBotInstr/CBotInstrCall.cpp
@@ -19,12 +19,12 @@
// Modules inlcude
#include "CBotInstrCall.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotExpression.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstrCall.h b/src/CBot/CBotInstr/CBotInstrCall.h
index db25903..2a35eeb 100644
--- a/src/CBot/CBotInstr/CBotInstrCall.h
+++ b/src/CBot/CBotInstr/CBotInstrCall.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstrMethode.cpp b/src/CBot/CBotInstr/CBotInstrMethode.cpp
index 26f188f..3778a9c 100644
--- a/src/CBot/CBotInstr/CBotInstrMethode.cpp
+++ b/src/CBot/CBotInstr/CBotInstrMethode.cpp
@@ -18,15 +18,15 @@
*/
// Modules inlcude
-#include "CBotInstrMethode.h"
+#include "CBot/CBotInstr/CBotInstrMethode.h"
-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstrMethode.h b/src/CBot/CBotInstr/CBotInstrMethode.h
index f944760..1c8512d 100644
--- a/src/CBot/CBotInstr/CBotInstrMethode.h
+++ b/src/CBot/CBotInstr/CBotInstrMethode.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstrUtils.cpp b/src/CBot/CBotInstr/CBotInstrUtils.cpp
index 1b7e65c..a7fc8c9 100644
--- a/src/CBot/CBotInstr/CBotInstrUtils.cpp
+++ b/src/CBot/CBotInstr/CBotInstrUtils.cpp
@@ -18,15 +18,15 @@
*/
// Modules inlcude
-#include "CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"
-#include "CBotToken.h"
-#include "CBotCStack.h"
-#include "CBotTypResult.h"
-#include "CBotExpression.h"
-#include "CBotClass.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotTypResult.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotClass.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInt.cpp b/src/CBot/CBotInstr/CBotInt.cpp
index 7ea8cbf..93cc0f6 100644
--- a/src/CBot/CBotInstr/CBotInt.cpp
+++ b/src/CBot/CBotInstr/CBotInt.cpp
@@ -18,16 +18,16 @@
*/
// Modules inlcude
-#include "CBotInt.h"
+#include "CBot/CBotInstr/CBotInt.h"
-#include "CBotLeftExprVar.h"
-#include "CBotInstArray.h"
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotInstArray.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInt.h b/src/CBot/CBotInstr/CBotInt.h
index 113897f..4489b8b 100644
--- a/src/CBot/CBotInstr/CBotInt.h
+++ b/src/CBot/CBotInstr/CBotInt.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotLeftExpr.cpp b/src/CBot/CBotInstr/CBotLeftExpr.cpp
index e09a226..28badca 100644
--- a/src/CBot/CBotInstr/CBotLeftExpr.cpp
+++ b/src/CBot/CBotInstr/CBotLeftExpr.cpp
@@ -18,16 +18,16 @@
*/
// Modules inlcude
-#include "CBotLeftExpr.h"
-#include "CBotFieldExpr.h"
-#include "CBotIndexExpr.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotLeftExpr.h"
+#include "CBot/CBotInstr/CBotFieldExpr.h"
+#include "CBot/CBotInstr/CBotIndexExpr.h"
+#include "CBot/CBotInstr/CBotExpression.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"
-#include "CBotVar/CBotVarArray.h"
+#include "CBot/CBotVar/CBotVarArray.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotLeftExpr.h b/src/CBot/CBotInstr/CBotLeftExpr.h
index 5f09b50..9ac75d9 100644
--- a/src/CBot/CBotInstr/CBotLeftExpr.h
+++ b/src/CBot/CBotInstr/CBotLeftExpr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotLeftExprVar.cpp b/src/CBot/CBotInstr/CBotLeftExprVar.cpp
index 18af17c..517d8b7 100644
--- a/src/CBot/CBotInstr/CBotLeftExprVar.cpp
+++ b/src/CBot/CBotInstr/CBotLeftExprVar.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotLeftExprVar.h b/src/CBot/CBotInstr/CBotLeftExprVar.h
index 0c9e0cc..a9526e8 100644
--- a/src/CBot/CBotInstr/CBotLeftExprVar.h
+++ b/src/CBot/CBotInstr/CBotLeftExprVar.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotListArray.cpp b/src/CBot/CBotInstr/CBotListArray.cpp
index ce1a5f8..f19cfa5 100644
--- a/src/CBot/CBotInstr/CBotListArray.cpp
+++ b/src/CBot/CBotInstr/CBotListArray.cpp
@@ -18,17 +18,17 @@
*/
// Modules inlcude
-#include "CBotListArray.h"
+#include "CBot/CBotInstr/CBotListArray.h"
-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"
-#include "CBotExprNull.h"
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotExprNull.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotListArray.h b/src/CBot/CBotInstr/CBotListArray.h
index 32a155c..a5069a9 100644
--- a/src/CBot/CBotInstr/CBotListArray.h
+++ b/src/CBot/CBotInstr/CBotListArray.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotListExpression.cpp b/src/CBot/CBotInstr/CBotListExpression.cpp
index 670f3fb..5f5d914 100644
--- a/src/CBot/CBotInstr/CBotListExpression.cpp
+++ b/src/CBot/CBotInstr/CBotListExpression.cpp
@@ -18,15 +18,15 @@
*/
// Modules inlcude
-#include "CBotListExpression.h"
-#include "CBotExpression.h"
-#include "CBotIString.h"
-#include "CBotFloat.h"
+#include "CBot/CBotInstr/CBotListExpression.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotIString.h"
+#include "CBot/CBotInstr/CBotFloat.h"
#include "CBotBoolean.h"
-#include "CBotInt.h"
+#include "CBot/CBotInstr/CBotInt.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotListExpression.h b/src/CBot/CBotInstr/CBotListExpression.h
index a4ea3b2..1b4ccae 100644
--- a/src/CBot/CBotInstr/CBotListExpression.h
+++ b/src/CBot/CBotInstr/CBotListExpression.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotListInstr.cpp b/src/CBot/CBotInstr/CBotListInstr.cpp
index 576012b..13b4ded 100644
--- a/src/CBot/CBotInstr/CBotListInstr.cpp
+++ b/src/CBot/CBotInstr/CBotListInstr.cpp
@@ -18,11 +18,11 @@
*/
// Modules inlcude
-#include "CBotListInstr.h"
-#include "CBotBlock.h"
+#include "CBot/CBotInstr/CBotListInstr.h"
+#include "CBot/CBotInstr/CBotBlock.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotListInstr.h b/src/CBot/CBotInstr/CBotListInstr.h
index b0612d8..b3d4362 100644
--- a/src/CBot/CBotInstr/CBotListInstr.h
+++ b/src/CBot/CBotInstr/CBotListInstr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotLogicExpr.cpp b/src/CBot/CBotInstr/CBotLogicExpr.cpp
index d332d18..9e1eb4c 100644
--- a/src/CBot/CBotInstr/CBotLogicExpr.cpp
+++ b/src/CBot/CBotInstr/CBotLogicExpr.cpp
@@ -18,9 +18,9 @@
*/
// Modules inlcude
-#include "CBotLogicExpr.h"
+#include "CBot/CBotInstr/CBotLogicExpr.h"
-#include "CBotStack.h"
+#include "CBot/CBotStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotLogicExpr.h b/src/CBot/CBotInstr/CBotLogicExpr.h
index 25e6785..33b6503 100644
--- a/src/CBot/CBotInstr/CBotLogicExpr.h
+++ b/src/CBot/CBotInstr/CBotLogicExpr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotNew.cpp b/src/CBot/CBotInstr/CBotNew.cpp
index b7e3631..2351835 100644
--- a/src/CBot/CBotInstr/CBotNew.cpp
+++ b/src/CBot/CBotInstr/CBotNew.cpp
@@ -18,15 +18,15 @@
*/
// Modules inlcude
-#include "CBotNew.h"
+#include "CBot/CBotInstr/CBotNew.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"
-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotNew.h b/src/CBot/CBotInstr/CBotNew.h
index f93bb6b..8a69e61 100644
--- a/src/CBot/CBotInstr/CBotNew.h
+++ b/src/CBot/CBotInstr/CBotNew.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotParExpr.cpp b/src/CBot/CBotInstr/CBotParExpr.cpp
index 21b40d1..e4e3479 100644
--- a/src/CBot/CBotInstr/CBotParExpr.cpp
+++ b/src/CBot/CBotInstr/CBotParExpr.cpp
@@ -18,23 +18,23 @@
*/
// Modules inlcude
-#include "CBotParExpr.h"
-#include "CBotExprUnaire.h"
-#include "CBotExprVar.h"
-#include "CBotInstrCall.h"
-#include "CBotPostIncExpr.h"
-#include "CBotPreIncExpr.h"
-#include "CBotExprNum.h"
-#include "CBotExprAlpha.h"
-#include "CBotExprBool.h"
-#include "CBotNew.h"
-#include "CBotExprNull.h"
-#include "CBotExprNan.h"
-#include "CBotExpression.h"
-
-#include "CBotVar/CBotVar.h"
-
-#include "CBotCStack.h"
+#include "CBot/CBotInstr/CBotParExpr.h"
+#include "CBot/CBotInstr/CBotExprUnaire.h"
+#include "CBot/CBotInstr/CBotExprVar.h"
+#include "CBot/CBotInstr/CBotInstrCall.h"
+#include "CBot/CBotInstr/CBotPostIncExpr.h"
+#include "CBot/CBotInstr/CBotPreIncExpr.h"
+#include "CBot/CBotInstr/CBotExprNum.h"
+#include "CBot/CBotInstr/CBotExprAlpha.h"
+#include "CBot/CBotInstr/CBotExprBool.h"
+#include "CBot/CBotInstr/CBotNew.h"
+#include "CBot/CBotInstr/CBotExprNull.h"
+#include "CBot/CBotInstr/CBotExprNan.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+
+#include "CBot/CBotVar/CBotVar.h"
+
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotParExpr.h b/src/CBot/CBotInstr/CBotParExpr.h
index 3fdbb63..992b702 100644
--- a/src/CBot/CBotInstr/CBotParExpr.h
+++ b/src/CBot/CBotInstr/CBotParExpr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotPostIncExpr.cpp b/src/CBot/CBotInstr/CBotPostIncExpr.cpp
index 938274e..9953102 100644
--- a/src/CBot/CBotInstr/CBotPostIncExpr.cpp
+++ b/src/CBot/CBotInstr/CBotPostIncExpr.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotPostIncExpr.h"
-#include "CBotExprVar.h"
+#include "CBot/CBotInstr/CBotPostIncExpr.h"
+#include "CBot/CBotInstr/CBotExprVar.h"
-#include "CBotStack.h"
+#include "CBot/CBotStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotPostIncExpr.h b/src/CBot/CBotInstr/CBotPostIncExpr.h
index 79bc86e..cdc45b3 100644
--- a/src/CBot/CBotInstr/CBotPostIncExpr.h
+++ b/src/CBot/CBotInstr/CBotPostIncExpr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotPreIncExpr.cpp b/src/CBot/CBotInstr/CBotPreIncExpr.cpp
index 30ee9a9..6e8b744 100644
--- a/src/CBot/CBotInstr/CBotPreIncExpr.cpp
+++ b/src/CBot/CBotInstr/CBotPreIncExpr.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotPreIncExpr.h"
-#include "CBotExprVar.h"
+#include "CBot/CBotInstr/CBotPreIncExpr.h"
+#include "CBot/CBotInstr/CBotExprVar.h"
-#include "CBotStack.h"
+#include "CBot/CBotStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotPreIncExpr.h b/src/CBot/CBotInstr/CBotPreIncExpr.h
index cf91a22..eb5d2a9 100644
--- a/src/CBot/CBotInstr/CBotPreIncExpr.h
+++ b/src/CBot/CBotInstr/CBotPreIncExpr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotReturn.cpp b/src/CBot/CBotInstr/CBotReturn.cpp
index 9f5d00f..c89e959 100644
--- a/src/CBot/CBotInstr/CBotReturn.cpp
+++ b/src/CBot/CBotInstr/CBotReturn.cpp
@@ -18,14 +18,14 @@
*/
// Modules inlcude
-#include "CBotReturn.h"
+#include "CBot/CBotInstr/CBotReturn.h"
-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotExpression.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotReturn.h b/src/CBot/CBotInstr/CBotReturn.h
index 7af52e5..e41240e 100644
--- a/src/CBot/CBotInstr/CBotReturn.h
+++ b/src/CBot/CBotInstr/CBotReturn.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotSwitch.cpp b/src/CBot/CBotInstr/CBotSwitch.cpp
index ef53fd7..0104d5d 100644
--- a/src/CBot/CBotInstr/CBotSwitch.cpp
+++ b/src/CBot/CBotInstr/CBotSwitch.cpp
@@ -20,13 +20,13 @@
*/
// Modules inlcude
-#include "CBotSwitch.h"
-#include "CBotCase.h"
-#include "CBotBlock.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotSwitch.h"
+#include "CBot/CBotInstr/CBotCase.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotExpression.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotSwitch.h b/src/CBot/CBotInstr/CBotSwitch.h
index 6edb38b..f174161 100644
--- a/src/CBot/CBotInstr/CBotSwitch.h
+++ b/src/CBot/CBotInstr/CBotSwitch.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotThrow.cpp b/src/CBot/CBotInstr/CBotThrow.cpp
index 4fc8cdd..4525dbb 100644
--- a/src/CBot/CBotInstr/CBotThrow.cpp
+++ b/src/CBot/CBotInstr/CBotThrow.cpp
@@ -18,11 +18,11 @@
*/
// Modules inlcude
-#include "CBotThrow.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotThrow.h"
+#include "CBot/CBotInstr/CBotExpression.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotThrow.h b/src/CBot/CBotInstr/CBotThrow.h
index cbe06e5..62e11fc 100644
--- a/src/CBot/CBotInstr/CBotThrow.h
+++ b/src/CBot/CBotInstr/CBotThrow.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotTry.cpp b/src/CBot/CBotInstr/CBotTry.cpp
index d3aecf8..5cf5790 100644
--- a/src/CBot/CBotInstr/CBotTry.cpp
+++ b/src/CBot/CBotInstr/CBotTry.cpp
@@ -19,10 +19,10 @@
// Modules inlcude
#include "CBotTry.h"
-#include "CBotBlock.h"
+#include "CBot/CBotInstr/CBotBlock.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotTry.h b/src/CBot/CBotInstr/CBotTry.h
index 9c79b3a..6777a71 100644
--- a/src/CBot/CBotInstr/CBotTry.h
+++ b/src/CBot/CBotInstr/CBotTry.h
@@ -18,9 +18,9 @@
*/
// Modules inlcude
-#include "CBotCatch.h"
+#include "CBot/CBotInstr/CBotCatch.h"
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotTwoOpExpr.cpp b/src/CBot/CBotInstr/CBotTwoOpExpr.cpp
index 0d97f40..26342f9 100644
--- a/src/CBot/CBotInstr/CBotTwoOpExpr.cpp
+++ b/src/CBot/CBotInstr/CBotTwoOpExpr.cpp
@@ -18,18 +18,18 @@
*/
// Modules inlcude
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"
-#include "CBotParExpr.h"
-#include "CBotLogicExpr.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotParExpr.h"
+#include "CBot/CBotInstr/CBotLogicExpr.h"
+#include "CBot/CBotInstr/CBotExpression.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotTwoOpExpr.h b/src/CBot/CBotInstr/CBotTwoOpExpr.h
index 63e20dd..e982964 100644
--- a/src/CBot/CBotInstr/CBotTwoOpExpr.h
+++ b/src/CBot/CBotInstr/CBotTwoOpExpr.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotWhile.cpp b/src/CBot/CBotInstr/CBotWhile.cpp
index eb38aea..99e120e 100644
--- a/src/CBot/CBotInstr/CBotWhile.cpp
+++ b/src/CBot/CBotInstr/CBotWhile.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotWhile.h"
-#include "CBotBlock.h"
-#include "CBotCondition.h"
+#include "CBot/CBotInstr/CBotWhile.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotCondition.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotWhile.h b/src/CBot/CBotInstr/CBotWhile.h
index a6fac94..6b91c74 100644
--- a/src/CBot/CBotInstr/CBotWhile.h
+++ b/src/CBot/CBotInstr/CBotWhile.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotProgram.cpp b/src/CBot/CBotProgram.cpp
index 1bdd89c..e2058a8 100644
--- a/src/CBot/CBotProgram.cpp
+++ b/src/CBot/CBotProgram.cpp
@@ -18,16 +18,16 @@
*/
// Modules inlcude
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
-#include "CBotCall.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
-#include "CBotUtils.h"
-#include "CBotFileUtils.h"
+#include "CBot/CBotCall.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"
+#include "CBot/CBotUtils.h"
+#include "CBot/CBotFileUtils.h"
-#include "CBotInstr/CBotFunction.h"
+#include "CBot/CBotInstr/CBotFunction.h"
#include "StringFunctions.h"
diff --git a/src/CBot/CBotProgram.h b/src/CBot/CBotProgram.h
index 87dff3c..88dd074 100644
--- a/src/CBot/CBotProgram.h
+++ b/src/CBot/CBotProgram.h
@@ -20,11 +20,11 @@
#pragma once
// Modules inlcude
-#include "CBotTypResult.h"
-#include "CBotString.h"
-#include "CBotStringArray.h"
+#include "CBot/CBotTypResult.h"
+#include "CBot/CBotString.h"
+#include "CBot/CBotStringArray.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
// Local include
diff --git a/src/CBot/CBotStack.cpp b/src/CBot/CBotStack.cpp
index ac312c9..8577c45 100644
--- a/src/CBot/CBotStack.cpp
+++ b/src/CBot/CBotStack.cpp
@@ -18,15 +18,15 @@
*/
// Modules inlcude
-#include "CBotStack.h"
-#include "CBotCall.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCall.h"
-#include "CBotInstr/CBotFunction.h"
+#include "CBot/CBotInstr/CBotFunction.h"
-#include "CBotVar/CBotVarPointer.h"
-#include "CBotVar/CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarPointer.h"
+#include "CBot/CBotVar/CBotVarClass.h"
-#include "CBotFileUtils.h"
+#include "CBot/CBotFileUtils.h"
// Local include
diff --git a/src/CBot/CBotStack.h b/src/CBot/CBotStack.h
index 0e8ddd0..3b58116 100644
--- a/src/CBot/CBotStack.h
+++ b/src/CBot/CBotStack.h
@@ -20,9 +20,9 @@
#pragma once
// Modules inlcude
-#include "CBotDefines.h"
-#include "CBotTypResult.h"
-#include "CBotString.h"
+#include "CBot/CBotDefines.h"
+#include "CBot/CBotTypResult.h"
+#include "CBot/CBotString.h"
// Local include
diff --git a/src/CBot/CBotString.cpp b/src/CBot/CBotString.cpp
index d8fc07c..fafcf77 100644
--- a/src/CBot/CBotString.cpp
+++ b/src/CBot/CBotString.cpp
@@ -19,7 +19,7 @@
/////////////////////////////////////////////////////
-#include "CBotString.h"
+#include "CBot/CBotString.h"
//strings management
#include <cstdlib>
diff --git a/src/CBot/CBotString.h b/src/CBot/CBotString.h
index 58630ea..3d87d2c 100644
--- a/src/CBot/CBotString.h
+++ b/src/CBot/CBotString.h
@@ -20,9 +20,9 @@
#pragma once
// Modules inlcude
-#include "CBotUtils.h"
+#include "CBot/CBotUtils.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
// Local include
diff --git a/src/CBot/CBotStringArray.cpp b/src/CBot/CBotStringArray.cpp
index 6d5d661..add3249 100644
--- a/src/CBot/CBotStringArray.cpp
+++ b/src/CBot/CBotStringArray.cpp
@@ -18,9 +18,9 @@
*/
// Modules inlcude
-#include "CBotStringArray.h"
+#include "CBot/CBotStringArray.h"
-#include "CBotUtils.h"
+#include "CBot/CBotUtils.h"
// Local include
diff --git a/src/CBot/CBotStringArray.h b/src/CBot/CBotStringArray.h
index bc13233..af4e9ef 100644
--- a/src/CBot/CBotStringArray.h
+++ b/src/CBot/CBotStringArray.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotString.h"
+#include "CBot/CBotString.h"
// Local include
diff --git a/src/CBot/CBotToken.cpp b/src/CBot/CBotToken.cpp
index d5840f9..6b34d68 100644
--- a/src/CBot/CBotToken.cpp
+++ b/src/CBot/CBotToken.cpp
@@ -18,7 +18,7 @@
*/
// Modules inlcude
-#include "CBotToken.h"
+#include "CBot/CBotToken.h"
// Local include
diff --git a/src/CBot/CBotToken.h b/src/CBot/CBotToken.h
index 85dc698..12be45c 100644
--- a/src/CBot/CBotToken.h
+++ b/src/CBot/CBotToken.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotStringArray.h"
+#include "CBot/CBotStringArray.h"
// Local include
diff --git a/src/CBot/CBotTypResult.cpp b/src/CBot/CBotTypResult.cpp
index 0ba8ff5..bde4f74 100644
--- a/src/CBot/CBotTypResult.cpp
+++ b/src/CBot/CBotTypResult.cpp
@@ -18,11 +18,11 @@
*/
// Modules inlcude
-#include "CBotTypResult.h"
+#include "CBot/CBotTypResult.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
-#include "CBotClass.h"
+#include "CBot/CBotClass.h"
// Local include
diff --git a/src/CBot/CBotUtils.cpp b/src/CBot/CBotUtils.cpp
index 5e38cb5..715a84c 100644
--- a/src/CBot/CBotUtils.cpp
+++ b/src/CBot/CBotUtils.cpp
@@ -18,14 +18,14 @@
*/
// Modules inlcude
-#include "CBotUtils.h"
+#include "CBot/CBotUtils.h"
-#include "CBotToken.h"
-#include "CBotClass.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotUtils.h b/src/CBot/CBotUtils.h
index 0ce7641..819331c 100644
--- a/src/CBot/CBotUtils.h
+++ b/src/CBot/CBotUtils.h
@@ -20,8 +20,8 @@
#pragma once
// Modules inlcude
-#include "CBotString.h"
-#include "CBotTypResult.h"
+#include "CBot/CBotString.h"
+#include "CBot/CBotTypResult.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVar.cpp b/src/CBot/CBotVar/CBotVar.cpp
index 4f75249..43a6a34 100644
--- a/src/CBot/CBotVar/CBotVar.cpp
+++ b/src/CBot/CBotVar/CBotVar.cpp
@@ -19,21 +19,21 @@
// Modules inlcude
-#include "CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
-#include "CBotStack.h"
+#include "CBot/CBotStack.h"
-#include "CBotVar/CBotVarArray.h"
-#include "CBotVar/CBotVarPointer.h"
-#include "CBotVar/CBotVarClass.h"
-#include "CBotVar/CBotVarBoolean.h"
-#include "CBotVar/CBotVarString.h"
-#include "CBotVar/CBotVarFloat.h"
-#include "CBotVar/CBotVarInt.h"
+#include "CBot/CBotVar/CBotVarArray.h"
+#include "CBot/CBotVar/CBotVarPointer.h"
+#include "CBot/CBotVar/CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarBoolean.h"
+#include "CBot/CBotVar/CBotVarString.h"
+#include "CBot/CBotVar/CBotVarFloat.h"
+#include "CBot/CBotVar/CBotVarInt.h"
-#include "CBotClass.h"
+#include "CBot/CBotClass.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVar.h b/src/CBot/CBotVar/CBotVar.h
index 1abedb3..56a5d5d 100644
--- a/src/CBot/CBotVar/CBotVar.h
+++ b/src/CBot/CBotVar/CBotVar.h
@@ -20,9 +20,9 @@
#pragma once
// Modules inlcude
-#include "../CBotDefines.h"
+#include "CBot/CBotDefines.h"
-#include "../CBotString.h"
+#include "CBot/CBotString.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarArray.cpp b/src/CBot/CBotVar/CBotVarArray.cpp
index cece811..f24dd20 100644
--- a/src/CBot/CBotVar/CBotVarArray.cpp
+++ b/src/CBot/CBotVar/CBotVarArray.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "CBotVarArray.h"
-#include "CBotVarClass.h"
-#include "CBotToken.h"
-#include "CBotFileUtils.h"
+#include "CBot/CBotVar/CBotVarArray.h"
+#include "CBot/CBotVar/CBotVarClass.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotFileUtils.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarArray.h b/src/CBot/CBotVar/CBotVarArray.h
index 650437f..542984d 100644
--- a/src/CBot/CBotVar/CBotVarArray.h
+++ b/src/CBot/CBotVar/CBotVarArray.h
@@ -20,9 +20,9 @@
#pragma once
// Modules inlcude
-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarBoolean.cpp b/src/CBot/CBotVar/CBotVarBoolean.cpp
index b768007..2ae7e6b 100644
--- a/src/CBot/CBotVar/CBotVarBoolean.cpp
+++ b/src/CBot/CBotVar/CBotVarBoolean.cpp
@@ -18,11 +18,11 @@
*/
// Modules inlcude
-#include "CBotVarBoolean.h"
+#include "CBot/CBotVar/CBotVarBoolean.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
-#include "CBotUtils.h"
+#include "CBot/CBotUtils.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarBoolean.h b/src/CBot/CBotVar/CBotVarBoolean.h
index f21cf28..0451f6d 100644
--- a/src/CBot/CBotVar/CBotVarBoolean.h
+++ b/src/CBot/CBotVar/CBotVarBoolean.h
@@ -20,9 +20,9 @@
#pragma once
// Modules inlcude
-#include "CBotToken.h"
+#include "CBot/CBotToken.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarClass.cpp b/src/CBot/CBotVar/CBotVarClass.cpp
index 467255c..894ff03 100644
--- a/src/CBot/CBotVar/CBotVarClass.cpp
+++ b/src/CBot/CBotVar/CBotVarClass.cpp
@@ -18,15 +18,15 @@
*/
// Modules inlcude
-#include "CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarClass.h"
-#include "CBotClass.h"
-#include "CBotStack.h"
-#include "CBotDefines.h"
+#include "CBot/CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotDefines.h"
-#include "CBotFileUtils.h"
+#include "CBot/CBotFileUtils.h"
-#include "CBotInstr/CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarClass.h b/src/CBot/CBotVar/CBotVarClass.h
index ff6f924..a04fccc 100644
--- a/src/CBot/CBotVar/CBotVarClass.h
+++ b/src/CBot/CBotVar/CBotVarClass.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarFloat.cpp b/src/CBot/CBotVar/CBotVarFloat.cpp
index 9f25fbb..d23fca4 100644
--- a/src/CBot/CBotVar/CBotVarFloat.cpp
+++ b/src/CBot/CBotVar/CBotVarFloat.cpp
@@ -18,13 +18,13 @@
*/
// Modules inlcude
-#include "CBotVarFloat.h"
+#include "CBot/CBotVar/CBotVarFloat.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
-#include "CBotToken.h"
+#include "CBot/CBotToken.h"
-#include "CBotUtils.h"
+#include "CBot/CBotUtils.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarFloat.h b/src/CBot/CBotVar/CBotVarFloat.h
index e55378a..37a121b 100644
--- a/src/CBot/CBotVar/CBotVarFloat.h
+++ b/src/CBot/CBotVar/CBotVarFloat.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarInt.cpp b/src/CBot/CBotVar/CBotVarInt.cpp
index 67220a1..f584997 100644
--- a/src/CBot/CBotVar/CBotVarInt.cpp
+++ b/src/CBot/CBotVar/CBotVarInt.cpp
@@ -18,13 +18,13 @@
*/
// Modules inlcude
-#include "CBotVarInt.h"
+#include "CBot/CBotVar/CBotVarInt.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
-#include "CBotToken.h"
+#include "CBot/CBotToken.h"
-#include "CBotUtils.h"
+#include "CBot/CBotUtils.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarInt.h b/src/CBot/CBotVar/CBotVarInt.h
index 524c276..0d8372e 100644
--- a/src/CBot/CBotVar/CBotVarInt.h
+++ b/src/CBot/CBotVar/CBotVarInt.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarPointer.cpp b/src/CBot/CBotVar/CBotVarPointer.cpp
index ff01eec..de0f166 100644
--- a/src/CBot/CBotVar/CBotVarPointer.cpp
+++ b/src/CBot/CBotVar/CBotVarPointer.cpp
@@ -18,14 +18,14 @@
*/
// Modules inlcude
-#include "CBotVarPointer.h"
-#include "CBotToken.h"
-#include "CBotClass.h"
-#include "CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarPointer.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotClass.h"
+#include "CBot/CBotVar/CBotVarClass.h"
-#include "CBotFileUtils.h"
+#include "CBot/CBotFileUtils.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarPointer.h b/src/CBot/CBotVar/CBotVarPointer.h
index 278fbd8..8f54f58 100644
--- a/src/CBot/CBotVar/CBotVarPointer.h
+++ b/src/CBot/CBotVar/CBotVarPointer.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarString.cpp b/src/CBot/CBotVar/CBotVarString.cpp
index 09c4e76..25f39a6 100644
--- a/src/CBot/CBotVar/CBotVarString.cpp
+++ b/src/CBot/CBotVar/CBotVarString.cpp
@@ -18,13 +18,13 @@
*/
// Modules inlcude
-#include "CBotVarString.h"
+#include "CBot/CBotVar/CBotVarString.h"
-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"
-#include "CBotToken.h"
+#include "CBot/CBotToken.h"
-#include "CBotUtils.h"
+#include "CBot/CBotUtils.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarString.h b/src/CBot/CBotVar/CBotVarString.h
index 75b4b1d..662e1d9 100644
--- a/src/CBot/CBotVar/CBotVarString.h
+++ b/src/CBot/CBotVar/CBotVarString.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CMakeLists.txt b/src/CBot/CMakeLists.txt
index 91f0874..e9c602e 100644
--- a/src/CBot/CMakeLists.txt
+++ b/src/CBot/CMakeLists.txt
@@ -75,7 +75,7 @@ set(SOURCES
# Includes
set(LOCAL_INCLUDES
- ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
)
include_directories(${LOCAL_INCLUDES})
diff --git a/src/CBot/StringFunctions.cpp b/src/CBot/StringFunctions.cpp
index c38af37..e323fe3 100644
--- a/src/CBot/StringFunctions.cpp
+++ b/src/CBot/StringFunctions.cpp
@@ -18,12 +18,12 @@
*/
// Modules inlcude
-#include "StringFunctions.h"
+#include "CBot/StringFunctions.h"
-#include "CBotProgram.h"
-#include "CBotEnums.h"
+#include "CBot/CBotProgram.h"
+#include "CBot/CBotEnums.h"
-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/StringFunctions.h b/src/CBot/StringFunctions.h
index da534aa..fd3618f 100644
--- a/src/CBot/StringFunctions.h
+++ b/src/CBot/StringFunctions.h
@@ -20,7 +20,7 @@
#pragma once
// Modules inlcude
-#include "CBotTypResult.h"
+#include "CBot/CBotTypResult.h"
// Local include
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list