From ece0666954adae4e7b02bdec4ea8c9b16778740c Mon Sep 17 00:00:00 2001 From: Grunaka Date: Sun, 22 Nov 2015 18:29:25 +0100 Subject: [PATCH] Create new file CBot.h. Included only useful interfaces. --- src/CBot/CBot.h | 8 ++++++++ src/common/restext.cpp | 2 +- src/level/robotmain.cpp | 4 +--- src/object/implementation/programmable_impl.cpp | 2 +- src/script/script.cpp | 4 +--- src/script/script.h | 3 +-- src/script/scriptfunc.cpp | 4 +--- src/script/scriptfunc.h | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h index 868bf137..bea5ce75 100644 --- a/src/CBot/CBot.h +++ b/src/CBot/CBot.h @@ -18,6 +18,14 @@ */ // Modules inlcude +#include "CBot/resource.h" +#include "CBot/CBotFileUtils.h" +#include "CBot/CBotClass.h" +#include "CBot/CBotToken.h" +#include "CBot/CBotProgram.h" +#include "CBot/CBotTypResult.h" + +#include "CBot/CBotVar/CBotVar.h" // Local include diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 67ac2158..8b2cb435 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -22,7 +22,7 @@ #include "common/config.h" -#include "CBot/resource.h" +#include "CBot/CBot.h" #include "app/input.h" diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index e2c82908..51107497 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -19,9 +19,7 @@ #include "level/robotmain.h" -#include "CBot/CBotFileUtils.h" -// TODO must be replaced by CBot.h -#include "CBot/CBotClass.h" +#include "CBot/CBot.h" #include "app/app.h" #include "app/input.h" diff --git a/src/object/implementation/programmable_impl.cpp b/src/object/implementation/programmable_impl.cpp index 379929e5..cea959ce 100644 --- a/src/object/implementation/programmable_impl.cpp +++ b/src/object/implementation/programmable_impl.cpp @@ -40,7 +40,7 @@ #include "ui/controls/edit.h" -#include "CBot/CBotFileUtils.h" +#include "CBot/CBot.h" #include #include diff --git a/src/script/script.cpp b/src/script/script.cpp index 92c658f6..5908d43b 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -42,9 +42,7 @@ #include "ui/controls/interface.h" #include "ui/controls/list.h" -#include "CBot/CBotToken.h" -#include "CBot/CBotVar/CBotVar.h" -#include "CBot/CBotFileUtils.h" +#include "CBot/CBot.h" const int CBOT_IPF = 100; // CBOT: default number of instructions / frame diff --git a/src/script/script.h b/src/script/script.h index be3f055a..7bf9b62f 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -24,8 +24,7 @@ #pragma once -// TODO replace by CBot.h -#include "CBot/CBotProgram.h" +#include "CBot/CBot.h" #include #include diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp index 252f09df..b2fce1c1 100644 --- a/src/script/scriptfunc.cpp +++ b/src/script/scriptfunc.cpp @@ -19,9 +19,7 @@ #include "script/scriptfunc.h" -// TODO must be replaced by CBot.h -#include "CBot/CBotClass.h" -#include "CBot/CBotVar/CBotVar.h" +#include "CBot/CBot.h" #include "app/app.h" diff --git a/src/script/scriptfunc.h b/src/script/scriptfunc.h index 13c48893..e739ecdd 100644 --- a/src/script/scriptfunc.h +++ b/src/script/scriptfunc.h @@ -24,7 +24,7 @@ #pragma once -#include "CBot/CBotTypResult.h" +#include "CBot/CBot.h" #include "common/error.h"