summaryrefslogtreecommitdiffstats
path: root/src/CBot
diff options
context:
space:
mode:
authorPiotr Dziwiński <piotr.dziwinski@nsn.com>2013-02-16 22:37:43 +0100
committerPiotr Dziwiński <piotr.dziwinski@nsn.com>2013-02-17 12:11:56 +0100
commit001d37b257b126dd6ef1dced70f94ff3d2806d28 (patch)
tree1025979c635c899f196d606f7d74170e33ef4f3a /src/CBot
parent45040318b026f8864d244e39f1703685ad688470 (diff)
downloadcolobot-001d37b257b126dd6ef1dced70f94ff3d2806d28.tar.gz
colobot-001d37b257b126dd6ef1dced70f94ff3d2806d28.tar.bz2
colobot-001d37b257b126dd6ef1dced70f94ff3d2806d28.zip
CInstanceManager refactoring
* removed classes managed by CInstanceManager except for CObject, CPyro, CBrain and CPhysics because of dependencies * refactored instance searching to use existing singleton instances of CApplication, CEngine and CRobotMain and calling their getter functions
Diffstat (limited to 'src/CBot')
-rw-r--r--src/CBot/CBotDll.h6
-rw-r--r--src/CBot/CBotToken.cpp2
-rw-r--r--src/CBot/ClassFILE.cpp2
3 files changed, 2 insertions, 8 deletions
diff --git a/src/CBot/CBotDll.h b/src/CBot/CBotDll.h
index 7af63ca..b401528 100644
--- a/src/CBot/CBotDll.h
+++ b/src/CBot/CBotDll.h
@@ -15,14 +15,13 @@
// * along with this program. If not, see http://www.gnu.org/licenses/.
////////////////////////////////////////////////////////////////////////
-#pragma once
-#ifndef _CBOTDLL_H_
-#define _CBOTDLL_H_
/**
* \file CBotDll.h
* \brief Library for interpretation of CBOT language
*/
+#pragma once
+
#include <stdio.h>
#include "resource.h"
#include <map>
@@ -1114,5 +1113,4 @@ bool rDoGoto( CBotVar* pVar, CBotVar* pResult, int& exception )
}
#endif
-#endif //_CBOTDLL_H_
diff --git a/src/CBot/CBotToken.cpp b/src/CBot/CBotToken.cpp
index c6e65e7..f03ca91 100644
--- a/src/CBot/CBotToken.cpp
+++ b/src/CBot/CBotToken.cpp
@@ -15,8 +15,6 @@
// * along with this program. If not, see http://www.gnu.org/licenses/.
-//CBotToken.cpp
-
//////////////////////////////////////////////////////////////////
// Managing Tokens
// the text of a program is first transformed
diff --git a/src/CBot/ClassFILE.cpp b/src/CBot/ClassFILE.cpp
index e5bc260..b0f7977 100644
--- a/src/CBot/ClassFILE.cpp
+++ b/src/CBot/ClassFILE.cpp
@@ -14,8 +14,6 @@
// * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.
-// ClassFile.cpp
-//
// definition of methods for class FILE