[colobot] 134/377: Cleaning the CBot.h file.
Didier Raboud
odyx at moszumanska.debian.org
Wed Mar 30 13:34:07 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 575ff47c829c775eb92cac058115bda3d54149d1
Author: Grunaka <dev at romainbreton.fr>
Date: Sun Nov 22 17:54:40 2015 +0100
Cleaning the CBot.h file.
---
src/CBot/CBot.h | 32 +++-----------------------------
src/CBot/CBotCallMethode.h | 8 ++++++--
src/CBot/CBotDefParam.cpp | 2 --
src/CBot/CBotInstr/CBotBlock.h | 2 --
src/CBot/CBotInstr/CBotBoolExpr.h | 2 --
src/CBot/CBotInstr/CBotBoolean.h | 2 --
src/CBot/CBotInstr/CBotBreak.h | 2 --
src/CBot/CBotInstr/CBotCase.h | 2 --
src/CBot/CBotInstr/CBotCatch.h | 2 --
src/CBot/CBotInstr/CBotClassInst.h | 2 --
src/CBot/CBotInstr/CBotCondition.h | 2 --
src/CBot/CBotInstr/CBotDo.h | 2 --
src/CBot/CBotInstr/CBotEmpty.h | 2 --
src/CBot/CBotInstr/CBotExprAlpha.h | 2 --
src/CBot/CBotInstr/CBotExprBool.h | 2 --
src/CBot/CBotInstr/CBotExprNan.h | 2 --
src/CBot/CBotInstr/CBotExprNull.h | 2 --
src/CBot/CBotInstr/CBotExprNum.h | 2 --
src/CBot/CBotInstr/CBotExprUnaire.h | 2 --
src/CBot/CBotInstr/CBotExprVar.h | 2 --
src/CBot/CBotInstr/CBotExpression.h | 2 --
src/CBot/CBotInstr/CBotFieldExpr.h | 2 --
src/CBot/CBotInstr/CBotFloat.h | 2 --
src/CBot/CBotInstr/CBotFor.h | 2 --
src/CBot/CBotInstr/CBotFunction.cpp | 2 --
src/CBot/CBotInstr/CBotFunction.h | 2 --
src/CBot/CBotInstr/CBotIString.h | 2 --
src/CBot/CBotInstr/CBotIf.h | 2 --
src/CBot/CBotInstr/CBotIndexExpr.h | 2 --
src/CBot/CBotInstr/CBotInstArray.h | 2 --
src/CBot/CBotInstr/CBotInstrCall.h | 2 --
src/CBot/CBotInstr/CBotInstrMethode.h | 2 --
src/CBot/CBotInstr/CBotInt.h | 2 --
src/CBot/CBotInstr/CBotLeftExpr.h | 2 --
src/CBot/CBotInstr/CBotLeftExprVar.h | 2 --
src/CBot/CBotInstr/CBotListArray.h | 2 --
src/CBot/CBotInstr/CBotListExpression.h | 2 --
src/CBot/CBotInstr/CBotListInstr.h | 2 --
src/CBot/CBotInstr/CBotLogicExpr.h | 2 --
src/CBot/CBotInstr/CBotNew.h | 2 --
src/CBot/CBotInstr/CBotParExpr.h | 2 --
src/CBot/CBotInstr/CBotPostIncExpr.h | 2 --
src/CBot/CBotInstr/CBotPreIncExpr.h | 2 --
src/CBot/CBotInstr/CBotReturn.h | 2 --
src/CBot/CBotInstr/CBotSwitch.h | 2 --
src/CBot/CBotInstr/CBotThrow.h | 2 --
src/CBot/CBotInstr/CBotTry.h | 1 -
src/CBot/CBotInstr/CBotTwoOpExpr.h | 2 --
src/CBot/CBotInstr/CBotWhile.h | 2 --
src/CBot/CBotProgram.cpp | 2 --
src/CBot/CBotStack.h | 18 ++++++++++++------
src/CBot/CBotString.cpp | 5 ++---
src/CBot/CBotToken.cpp | 2 +-
src/CBot/CBotVar/CBotVar.cpp | 2 ++
src/CBot/CBotVar/CBotVarArray.cpp | 4 +++-
src/CBot/CBotVar/CBotVarArray.h | 1 -
src/CBot/CBotVar/CBotVarClass.h | 2 --
src/CBot/CBotVar/CBotVarPointer.cpp | 3 ++-
58 files changed, 31 insertions(+), 141 deletions(-)
diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h
index 97e2919..868bf13 100644
--- a/src/CBot/CBot.h
+++ b/src/CBot/CBot.h
@@ -17,34 +17,8 @@
* along with this program. If not, see http://gnu.org/licenses
*/
-////////////////////////////////////////////////////////////////////
-/**
- * \file CBot.h
- * \brief Interpreter of the language CBot for COLOBOT game
- */
-
-#pragma once
-
-#include "resource.h"
-#include "CBotToken.h" // token management
-#include "CBotProgram.h"
-
-
-/////////////////////////////////////////////////////////////////////
-// forward declaration
+// Modules inlcude
-class CBotParExpr; // basic type or instruction in parenthesis
- // Toto.truc
- // 12.5
- // "string"
- // ( expression )
-class CBotExprVar; // a variable name as
- // Toto
- // chose.truc.machin
-class CBotWhile; // while (...) {...};
-class CBotIf; // if (...) {...} else {...}
-class CBotDefParam; // paramerer list of a function
+// Local include
-#if 0
-extern void DEBUG( const char* text, int val, CBotStack* pile );
-#endif
+// Global include
diff --git a/src/CBot/CBotCallMethode.h b/src/CBot/CBotCallMethode.h
index 8ea4025..d60a9b7 100644
--- a/src/CBot/CBotCallMethode.h
+++ b/src/CBot/CBotCallMethode.h
@@ -20,12 +20,16 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
+#include "CBotTypResult.h"
+#include "CBotString.h"
// Local include
// Global include
-
+class CBotVar;
+class CBotCStack;
+class CBotStack;
+class CBotToken;
/*!
* \brief The CBotCallMethode class Class managing the methods declared by
diff --git a/src/CBot/CBotDefParam.cpp b/src/CBot/CBotDefParam.cpp
index 9af6043..fe7ce8b 100644
--- a/src/CBot/CBotDefParam.cpp
+++ b/src/CBot/CBotDefParam.cpp
@@ -20,8 +20,6 @@
// Modules inlcude
#include "CBotDefParam.h"
-#include "CBot.h"
-
#include "CBotUtils.h"
#include "CBotCStack.h"
diff --git a/src/CBot/CBotInstr/CBotBlock.h b/src/CBot/CBotInstr/CBotBlock.h
index 6c7c633..7df0bb5 100644
--- a/src/CBot/CBotInstr/CBotBlock.h
+++ b/src/CBot/CBotInstr/CBotBlock.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBoolExpr.h b/src/CBot/CBotInstr/CBotBoolExpr.h
index e50d8a6..af6cd4f 100644
--- a/src/CBot/CBotInstr/CBotBoolExpr.h
+++ b/src/CBot/CBotInstr/CBotBoolExpr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBoolean.h b/src/CBot/CBotInstr/CBotBoolean.h
index 217daad..e589f50 100644
--- a/src/CBot/CBotInstr/CBotBoolean.h
+++ b/src/CBot/CBotInstr/CBotBoolean.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotBreak.h b/src/CBot/CBotInstr/CBotBreak.h
index ae35a70..78b39dd 100644
--- a/src/CBot/CBotInstr/CBotBreak.h
+++ b/src/CBot/CBotInstr/CBotBreak.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotCase.h b/src/CBot/CBotInstr/CBotCase.h
index e504333..03ddddd 100644
--- a/src/CBot/CBotInstr/CBotCase.h
+++ b/src/CBot/CBotInstr/CBotCase.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotCatch.h b/src/CBot/CBotInstr/CBotCatch.h
index d4450ec..60ee00a 100644
--- a/src/CBot/CBotInstr/CBotCatch.h
+++ b/src/CBot/CBotInstr/CBotCatch.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotClassInst.h b/src/CBot/CBotInstr/CBotClassInst.h
index 3ee791f..ab70c0f 100644
--- a/src/CBot/CBotInstr/CBotClassInst.h
+++ b/src/CBot/CBotInstr/CBotClassInst.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotCondition.h b/src/CBot/CBotInstr/CBotCondition.h
index 3958cad..f36c998 100644
--- a/src/CBot/CBotInstr/CBotCondition.h
+++ b/src/CBot/CBotInstr/CBotCondition.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotDo.h b/src/CBot/CBotInstr/CBotDo.h
index 11fe40f..30f1db9 100644
--- a/src/CBot/CBotInstr/CBotDo.h
+++ b/src/CBot/CBotInstr/CBotDo.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotEmpty.h b/src/CBot/CBotInstr/CBotEmpty.h
index dc50b49..782e87c 100644
--- a/src/CBot/CBotInstr/CBotEmpty.h
+++ b/src/CBot/CBotInstr/CBotEmpty.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprAlpha.h b/src/CBot/CBotInstr/CBotExprAlpha.h
index 3cadc32..01e97a8 100644
--- a/src/CBot/CBotInstr/CBotExprAlpha.h
+++ b/src/CBot/CBotInstr/CBotExprAlpha.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprBool.h b/src/CBot/CBotInstr/CBotExprBool.h
index 90f53da..a81ec2e 100644
--- a/src/CBot/CBotInstr/CBotExprBool.h
+++ b/src/CBot/CBotInstr/CBotExprBool.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprNan.h b/src/CBot/CBotInstr/CBotExprNan.h
index 1f0d58d..c7c2596 100644
--- a/src/CBot/CBotInstr/CBotExprNan.h
+++ b/src/CBot/CBotInstr/CBotExprNan.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprNull.h b/src/CBot/CBotInstr/CBotExprNull.h
index 90b3f89..662ded3 100644
--- a/src/CBot/CBotInstr/CBotExprNull.h
+++ b/src/CBot/CBotInstr/CBotExprNull.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprNum.h b/src/CBot/CBotInstr/CBotExprNum.h
index 07fca7e..e9ccf93 100644
--- a/src/CBot/CBotInstr/CBotExprNum.h
+++ b/src/CBot/CBotInstr/CBotExprNum.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprUnaire.h b/src/CBot/CBotInstr/CBotExprUnaire.h
index 75b30a9..660afdd 100644
--- a/src/CBot/CBotInstr/CBotExprUnaire.h
+++ b/src/CBot/CBotInstr/CBotExprUnaire.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotExprVar.h b/src/CBot/CBotInstr/CBotExprVar.h
index 638cf8f..9757b89 100644
--- a/src/CBot/CBotInstr/CBotExprVar.h
+++ b/src/CBot/CBotInstr/CBotExprVar.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotDefines.h"
#include "CBotInstr.h"
diff --git a/src/CBot/CBotInstr/CBotExpression.h b/src/CBot/CBotInstr/CBotExpression.h
index ddf2e25..637ff05 100644
--- a/src/CBot/CBotInstr/CBotExpression.h
+++ b/src/CBot/CBotInstr/CBotExpression.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotLeftExpr.h"
#include "CBotInstr.h"
diff --git a/src/CBot/CBotInstr/CBotFieldExpr.h b/src/CBot/CBotInstr/CBotFieldExpr.h
index 41e828b..4a56a3f 100644
--- a/src/CBot/CBotInstr/CBotFieldExpr.h
+++ b/src/CBot/CBotInstr/CBotFieldExpr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFloat.h b/src/CBot/CBotInstr/CBotFloat.h
index 309697b..3e095fe 100644
--- a/src/CBot/CBotInstr/CBotFloat.h
+++ b/src/CBot/CBotInstr/CBotFloat.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFor.h b/src/CBot/CBotInstr/CBotFor.h
index d7d4256..56442b0 100644
--- a/src/CBot/CBotInstr/CBotFor.h
+++ b/src/CBot/CBotInstr/CBotFor.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotFunction.cpp b/src/CBot/CBotInstr/CBotFunction.cpp
index 0a629c3..f8e4b6d 100644
--- a/src/CBot/CBotInstr/CBotFunction.cpp
+++ b/src/CBot/CBotInstr/CBotFunction.cpp
@@ -23,8 +23,6 @@
#include "CBotInstr/CBotInstrUtils.h"
-#include "CBot.h"
-
#include "CBotInstr/CBotBlock.h"
#include "CBotInstr/CBotTwoOpExpr.h"
#include "CBotInstr/CBotExpression.h"
diff --git a/src/CBot/CBotInstr/CBotFunction.h b/src/CBot/CBotInstr/CBotFunction.h
index f1fc3c8..7c44dc3 100644
--- a/src/CBot/CBotInstr/CBotFunction.h
+++ b/src/CBot/CBotInstr/CBotFunction.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotIString.h b/src/CBot/CBotInstr/CBotIString.h
index 2ea8e4e..1435bb3 100644
--- a/src/CBot/CBotInstr/CBotIString.h
+++ b/src/CBot/CBotInstr/CBotIString.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotIf.h b/src/CBot/CBotInstr/CBotIf.h
index e39e522..de4c367 100644
--- a/src/CBot/CBotInstr/CBotIf.h
+++ b/src/CBot/CBotInstr/CBotIf.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotIndexExpr.h b/src/CBot/CBotInstr/CBotIndexExpr.h
index a8e7e07..fe1ea55 100644
--- a/src/CBot/CBotInstr/CBotIndexExpr.h
+++ b/src/CBot/CBotInstr/CBotIndexExpr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstArray.h b/src/CBot/CBotInstr/CBotInstArray.h
index 4ad025d..2b02c66 100644
--- a/src/CBot/CBotInstr/CBotInstArray.h
+++ b/src/CBot/CBotInstr/CBotInstArray.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstrCall.h b/src/CBot/CBotInstr/CBotInstrCall.h
index fa634fe..db25903 100644
--- a/src/CBot/CBotInstr/CBotInstrCall.h
+++ b/src/CBot/CBotInstr/CBotInstrCall.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInstrMethode.h b/src/CBot/CBotInstr/CBotInstrMethode.h
index ea39811..f944760 100644
--- a/src/CBot/CBotInstr/CBotInstrMethode.h
+++ b/src/CBot/CBotInstr/CBotInstrMethode.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotInt.h b/src/CBot/CBotInstr/CBotInt.h
index 085e626..113897f 100644
--- a/src/CBot/CBotInstr/CBotInt.h
+++ b/src/CBot/CBotInstr/CBotInt.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotLeftExpr.h b/src/CBot/CBotInstr/CBotLeftExpr.h
index aaf9ee4..5f09b50 100644
--- a/src/CBot/CBotInstr/CBotLeftExpr.h
+++ b/src/CBot/CBotInstr/CBotLeftExpr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotLeftExprVar.h b/src/CBot/CBotInstr/CBotLeftExprVar.h
index fd69372..0c9e0cc 100644
--- a/src/CBot/CBotInstr/CBotLeftExprVar.h
+++ b/src/CBot/CBotInstr/CBotLeftExprVar.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotListArray.h b/src/CBot/CBotInstr/CBotListArray.h
index 586cc86..32a155c 100644
--- a/src/CBot/CBotInstr/CBotListArray.h
+++ b/src/CBot/CBotInstr/CBotListArray.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotListExpression.h b/src/CBot/CBotInstr/CBotListExpression.h
index 451b218..a4ea3b2 100644
--- a/src/CBot/CBotInstr/CBotListExpression.h
+++ b/src/CBot/CBotInstr/CBotListExpression.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotListInstr.h b/src/CBot/CBotInstr/CBotListInstr.h
index 0aafaf5..b0612d8 100644
--- a/src/CBot/CBotInstr/CBotListInstr.h
+++ b/src/CBot/CBotInstr/CBotListInstr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotLogicExpr.h b/src/CBot/CBotInstr/CBotLogicExpr.h
index db6c67f..25e6785 100644
--- a/src/CBot/CBotInstr/CBotLogicExpr.h
+++ b/src/CBot/CBotInstr/CBotLogicExpr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotNew.h b/src/CBot/CBotInstr/CBotNew.h
index 02598b1..f93bb6b 100644
--- a/src/CBot/CBotInstr/CBotNew.h
+++ b/src/CBot/CBotInstr/CBotNew.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotParExpr.h b/src/CBot/CBotInstr/CBotParExpr.h
index 690d6ef..3fdbb63 100644
--- a/src/CBot/CBotInstr/CBotParExpr.h
+++ b/src/CBot/CBotInstr/CBotParExpr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotPostIncExpr.h b/src/CBot/CBotInstr/CBotPostIncExpr.h
index 3a30fce..79bc86e 100644
--- a/src/CBot/CBotInstr/CBotPostIncExpr.h
+++ b/src/CBot/CBotInstr/CBotPostIncExpr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotPreIncExpr.h b/src/CBot/CBotInstr/CBotPreIncExpr.h
index 896c0c9..cf91a22 100644
--- a/src/CBot/CBotInstr/CBotPreIncExpr.h
+++ b/src/CBot/CBotInstr/CBotPreIncExpr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotReturn.h b/src/CBot/CBotInstr/CBotReturn.h
index 1816bf2..7af52e5 100644
--- a/src/CBot/CBotInstr/CBotReturn.h
+++ b/src/CBot/CBotInstr/CBotReturn.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotSwitch.h b/src/CBot/CBotInstr/CBotSwitch.h
index b4cff5e..6edb38b 100644
--- a/src/CBot/CBotInstr/CBotSwitch.h
+++ b/src/CBot/CBotInstr/CBotSwitch.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotThrow.h b/src/CBot/CBotInstr/CBotThrow.h
index b5227ad..cbe06e5 100644
--- a/src/CBot/CBotInstr/CBotThrow.h
+++ b/src/CBot/CBotInstr/CBotThrow.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotTry.h b/src/CBot/CBotInstr/CBotTry.h
index bdc3d4d..9c79b3a 100644
--- a/src/CBot/CBotInstr/CBotTry.h
+++ b/src/CBot/CBotInstr/CBotTry.h
@@ -18,7 +18,6 @@
*/
// Modules inlcude
-#include "CBot.h"
#include "CBotCatch.h"
#include "CBotInstr.h"
diff --git a/src/CBot/CBotInstr/CBotTwoOpExpr.h b/src/CBot/CBotInstr/CBotTwoOpExpr.h
index 720755f..63e20dd 100644
--- a/src/CBot/CBotInstr/CBotTwoOpExpr.h
+++ b/src/CBot/CBotInstr/CBotTwoOpExpr.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotInstr/CBotWhile.h b/src/CBot/CBotInstr/CBotWhile.h
index 528fe8f..a6fac94 100644
--- a/src/CBot/CBotInstr/CBotWhile.h
+++ b/src/CBot/CBotInstr/CBotWhile.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotInstr.h"
// Local include
diff --git a/src/CBot/CBotProgram.cpp b/src/CBot/CBotProgram.cpp
index 187f560..1bdd89c 100644
--- a/src/CBot/CBotProgram.cpp
+++ b/src/CBot/CBotProgram.cpp
@@ -18,8 +18,6 @@
*/
// Modules inlcude
-#include "CBot.h"
-
#include "CBotVar/CBotVar.h"
#include "CBotCall.h"
diff --git a/src/CBot/CBotStack.h b/src/CBot/CBotStack.h
index 283a8ae..0e8ddd0 100644
--- a/src/CBot/CBotStack.h
+++ b/src/CBot/CBotStack.h
@@ -20,17 +20,21 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotDefines.h"
+#include "CBotTypResult.h"
+#include "CBotString.h"
// Local include
// Global include
+#include <cstdio>
// Forward declaration
class CBotInstr;
class CBotCall;
+class CBotVar;
+class CBotProgram;
+class CBotToken;
/*!
* \class CBotStack
@@ -122,8 +126,9 @@ public:
* \param [in] bModif Not used. Probably need to be removed
* \return Found variable
*/
- CBotVar* FindVar(CBotToken* &pToken, bool bUpdate = false,
- bool bModif = false);
+ CBotVar* FindVar(CBotToken* &pToken,
+ bool bUpdate = false,
+ bool bModif = false);
/**
* \brief Fetch a variable by its token.
@@ -133,8 +138,9 @@ public:
* \param [in] bModif Not used. Probably need to be removed
* \return Found variable
*/
- CBotVar* FindVar(CBotToken& pToken, bool bUpdate = false,
- bool bModif = false);
+ CBotVar* FindVar(CBotToken& pToken,
+ bool bUpdate = false,
+ bool bModif = false);
/**
* \brief Fetch variable by its name
diff --git a/src/CBot/CBotString.cpp b/src/CBot/CBotString.cpp
index 12cc546..d8fc07c 100644
--- a/src/CBot/CBotString.cpp
+++ b/src/CBot/CBotString.cpp
@@ -19,10 +19,9 @@
/////////////////////////////////////////////////////
-//strings management
-
-#include "CBot.h"
+#include "CBotString.h"
+//strings management
#include <cstdlib>
#include <cstring>
#include <algorithm>
diff --git a/src/CBot/CBotToken.cpp b/src/CBot/CBotToken.cpp
index 2b06c0f..d5840f9 100644
--- a/src/CBot/CBotToken.cpp
+++ b/src/CBot/CBotToken.cpp
@@ -18,7 +18,7 @@
*/
// Modules inlcude
-#include "CBot.h"
+#include "CBotToken.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVar.cpp b/src/CBot/CBotVar/CBotVar.cpp
index e5ce073..4f75249 100644
--- a/src/CBot/CBotVar/CBotVar.cpp
+++ b/src/CBot/CBotVar/CBotVar.cpp
@@ -33,6 +33,8 @@
#include "CBotClass.h"
+#include "CBotEnums.h"
+
// Local include
// Global include
diff --git a/src/CBot/CBotVar/CBotVarArray.cpp b/src/CBot/CBotVar/CBotVarArray.cpp
index 59a3b97..cece811 100644
--- a/src/CBot/CBotVar/CBotVarArray.cpp
+++ b/src/CBot/CBotVar/CBotVarArray.cpp
@@ -20,9 +20,11 @@
// Modules inlcude
#include "CBotVarArray.h"
#include "CBotVarClass.h"
-
+#include "CBotToken.h"
#include "CBotFileUtils.h"
+#include "CBotEnums.h"
+
// Local include
// Global include
diff --git a/src/CBot/CBotVar/CBotVarArray.h b/src/CBot/CBotVar/CBotVarArray.h
index 65222ac..650437f 100644
--- a/src/CBot/CBotVar/CBotVarArray.h
+++ b/src/CBot/CBotVar/CBotVarArray.h
@@ -20,7 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
#include "CBotDefines.h"
#include "CBotVar/CBotVar.h"
diff --git a/src/CBot/CBotVar/CBotVarClass.h b/src/CBot/CBotVar/CBotVarClass.h
index 5089c40..ff6f924 100644
--- a/src/CBot/CBotVar/CBotVarClass.h
+++ b/src/CBot/CBotVar/CBotVarClass.h
@@ -20,8 +20,6 @@
#pragma once
// Modules inlcude
-#include "CBot.h"
-
#include "CBotVar/CBotVar.h"
// Local include
diff --git a/src/CBot/CBotVar/CBotVarPointer.cpp b/src/CBot/CBotVar/CBotVarPointer.cpp
index 9bbaee7..ff01eec 100644
--- a/src/CBot/CBotVar/CBotVarPointer.cpp
+++ b/src/CBot/CBotVar/CBotVarPointer.cpp
@@ -20,12 +20,13 @@
// Modules inlcude
#include "CBotVarPointer.h"
#include "CBotToken.h"
-#include "CBot.h"
#include "CBotClass.h"
#include "CBotVarClass.h"
#include "CBotFileUtils.h"
+#include "CBotEnums.h"
+
// Local include
// Global 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