From 575ff47c829c775eb92cac058115bda3d54149d1 Mon Sep 17 00:00:00 2001 From: Grunaka Date: Sun, 22 Nov 2015 17:54:40 +0100 Subject: [PATCH] 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 97e2919f..868bf137 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 - */ +// Modules inlcude -#pragma once +// Local include -#include "resource.h" -#include "CBotToken.h" // token management -#include "CBotProgram.h" - - -///////////////////////////////////////////////////////////////////// -// forward declaration - -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 - -#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 8ea40254..d60a9b77 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 9af6043f..fe7ce8bf 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 6c7c6334..7df0bb5b 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 e50d8a63..af6cd4f8 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 217daadc..e589f508 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 ae35a70f..78b39dd3 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 e5043330..03ddddde 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 d4450ec1..60ee00a9 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 3ee791f0..ab70c0f2 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 3958cadb..f36c998a 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 11fe40f4..30f1db9d 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 dc50b49b..782e87ca 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 3cadc322..01e97a8e 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 90f53daa..a81ec2ee 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 1f0d58d8..c7c25963 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 90b3f89a..662ded3d 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 07fca7e9..e9ccf932 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 75b30a94..660afdd7 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 638cf8fe..9757b898 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 ddf2e257..637ff051 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 41e828bd..4a56a3f6 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 309697b0..3e095fe5 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 d7d4256d..56442b0c 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 0a629c39..f8e4b6df 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 f1fc3c8d..7c44dc3e 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 2ea8e4ee..1435bb36 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 e39e5226..de4c3672 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 a8e7e07a..fe1ea555 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 4ad025d6..2b02c66d 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 fa634fed..db259039 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 ea398115..f9447609 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 085e6265..113897f6 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 aaf9ee47..5f09b507 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 fd693727..0c9e0cc2 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 586cc864..32a155c6 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 451b2181..a4ea3b2f 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 0aafaf59..b0612d86 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 db6c67f6..25e67854 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 02598b1a..f93bb6be 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 690d6efb..3fdbb639 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 3a30fcef..79bc86e2 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 896c0c9a..cf91a22f 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 1816bf2d..7af52e52 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 b4cff5e4..6edb38b8 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 b5227ad7..cbe06e50 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 bdc3d4d8..9c79b3a4 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 720755fc..63e20ddc 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 528fe8f1..a6fac948 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 187f560e..1bdd89c6 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 283a8ae3..0e8ddd03 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 // 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 12cc546b..d8fc07c7 100644 --- a/src/CBot/CBotString.cpp +++ b/src/CBot/CBotString.cpp @@ -19,10 +19,9 @@ ///////////////////////////////////////////////////// +#include "CBotString.h" + //strings management - -#include "CBot.h" - #include #include #include diff --git a/src/CBot/CBotToken.cpp b/src/CBot/CBotToken.cpp index 2b06c0ff..d5840f99 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 e5ce073e..4f75249c 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 59a3b97d..cece8117 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 65222ac6..650437f3 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 5089c408..ff6f9248 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 9bbaee78..ff01eec7 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