summaryrefslogtreecommitdiffstats
path: root/src/CBot
diff options
context:
space:
mode:
authorZaba999 <zaba.marcin@gmail.com>2012-09-20 22:58:00 +0200
committerZaba999 <zaba.marcin@gmail.com>2012-09-20 22:58:00 +0200
commit191fdc614ed8022c145d3530f9d412e715ae37db (patch)
tree2813afe018c4e675bf6955e9324cdba297c76a51 /src/CBot
parent57d33d79ea570773d84ad81d4a61f50e079979ef (diff)
downloadcolobot-191fdc614ed8022c145d3530f9d412e715ae37db.tar.gz
colobot-191fdc614ed8022c145d3530f9d412e715ae37db.tar.bz2
colobot-191fdc614ed8022c145d3530f9d412e715ae37db.zip
changed paths for models and levels. Now it's possible to load level.
Diffstat (limited to 'src/CBot')
-rw-r--r--src/CBot/CBot.cpp4
-rw-r--r--src/CBot/CBot.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/src/CBot/CBot.cpp b/src/CBot/CBot.cpp
index 3a7c828..ed6831d 100644
--- a/src/CBot/CBot.cpp
+++ b/src/CBot/CBot.cpp
@@ -341,7 +341,7 @@ bool CBotInstr::CompCase(CBotStack* &pj, int val)
// compiles a statement block " { i ; i ; } "
// this class have no constructor because there is never an instance of this
-// class (TODO what about default constructor?)
+// class
// the object returned by Compile is usually of type CBotListInstr
@@ -3082,8 +3082,6 @@ CBotInstr* CBotExprVar::Compile(CBotToken* &p, CBotCStack* pStack, int privat)
// This is an element of the current class
// ads the equivalent of this. before
- /// \TODO need to be fixed revised and fixed after adding unit
- ///tests
CBotToken token("this");
inst->SetToken(&token);
(static_cast<CBotExprVar*>(inst))->m_nIdent = -2; // identificator for this
diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h
index 53a5633..8886308 100644
--- a/src/CBot/CBot.h
+++ b/src/CBot/CBot.h
@@ -1009,13 +1009,14 @@ public:
// an instruction block { .... }
class CBotBlock : public CBotInstr
{
-private:
-
public:
static
CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, bool bLocal = true);
static
CBotInstr* CompileBlkOrInst(CBotToken* &p, CBotCStack* pStack, bool bLocal = false);
+private:
+ CBotBlock();
+ CBotBlock(const CBotBlock &);
};