immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove CBotLinkedList from CBotFunction 

Fixup for 191151eb7b
No idea how I managed to forget that
dev-buzzingcars
krzys-h 2016-11-11 19:47:59 +01:00
parent 35d60aaae5
commit 6b7233c6ae
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CBot/CBotDebug.cpp
View File

@ -40,7 +40,6 @@ void CBotDebug::DumpCompiledProgram(CBotProgram* program)
for (CBotFunction* func : program->GetFunctions()) for (CBotFunction* func : program->GetFunctions())
{ {
funcIdMap[func->m_nFuncIdent] = func; funcIdMap[func->m_nFuncIdent] = func;
func = func->GetNext();
} }
std::set<CBotInstr*> finished; std::set<CBotInstr*> finished;

5
src/CBot/CBotInstr/CBotFunction.h
View File

@ -39,7 +39,7 @@ namespace CBot
* void classname::test() { ... } * void classname::test() { ... }
* \endcode * \endcode
*/ */
class CBotFunction : public CBotInstr, public CBotLinkedList<CBotFunction> class CBotFunction : public CBotInstr
{ {
public: public:
CBotFunction(); CBotFunction();
@ -91,9 +91,6 @@ public:
CBotStack* &pj, CBotStack* &pj,
CBotVar* pInstance = nullptr); CBotVar* pInstance = nullptr);
using CBotLinkedList<CBotFunction>::GetNext;
using CBotLinkedList<CBotFunction>::AddNext;
/*! /*!
* \brief Compile a function call * \brief Compile a function call
* *