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

Fix calling multi-level inherited methods

dev-new-models
melex750 2016-08-03 19:13:21 -04:00
parent d0a8a32a57
commit 860cdb0aea
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CBot/CBotClass.cpp
View File

@ -333,7 +333,7 @@ CBotTypResult CBotClass::CompileMethode(const std::string& name,
r = m_pMethod->CompileCall(name, ppParams, nIdent); r = m_pMethod->CompileCall(name, ppParams, nIdent);
if ( r.Eq(CBotErrUndefCall) && m_parent != nullptr ) if ( r.Eq(CBotErrUndefCall) && m_parent != nullptr )
return m_parent->m_pMethod->CompileCall(name, ppParams, nIdent); return m_parent->CompileMethode(name, pThis, ppParams, pStack, nIdent);
return r; return r;
} }
@ -354,9 +354,7 @@ bool CBotClass::ExecuteMethode(long& nIdent,
if (m_parent != nullptr) if (m_parent != nullptr)
{ {
ret = m_parent->m_pCalls->DoCall(name, pThis, ppParams, pResult, pStack, pToken); ret = m_parent->ExecuteMethode(nIdent, name, pThis, ppParams, pResult, pStack, pToken);
if (ret >= 0) return ret;
ret = m_parent->m_pMethod->DoCall(nIdent, name, pThis, ppParams, pStack, pToken, m_parent);
} }
return ret; return ret;
} }