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

Fixed commandline interpreter

dev-time-step
krzys-h 2015-12-26 14:37:36 +01:00
parent 07a4d6a16b
commit ef91fb8e9d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CBot/CBotStack.cpp
View File

@ -559,24 +559,24 @@ void CBotStack::SetUserPtr(void* user)
////////////////////////////////////////////////////////////////////////////////
bool CBotStack::ExecuteCall(long& nIdent, CBotToken* token, CBotVar** ppVar, const CBotTypResult& rettype)
{
CBotTypResult res;
int res;
// first looks by the identifier
res = m_prog->GetExternalCalls()->DoCall(nullptr, nullptr, ppVar, this, rettype);
if (res.GetType() >= 0) return res.GetType();
if (res >= 0) return res;
res = m_prog->GetFunctions()->DoCall(nIdent, "", ppVar, this, token );
if (res.GetType() >= 0) return res.GetType();
if (res >= 0) return res;
// if not found (recompile?) seeks by name
nIdent = 0;
res = m_prog->GetExternalCalls()->DoCall(token, nullptr, ppVar, this, rettype);
if (res.GetType() >= 0) return res.GetType();
if (res >= 0) return res;
res = m_prog->GetFunctions()->DoCall(nIdent, token->GetString(), ppVar, this, token );
if (res.GetType() >= 0) return res.GetType();
if (res >= 0) return res;
SetError(CBotErrUndefFunc, token);
return true;

2
test/cbot/console/main.cpp
View File

@ -5,6 +5,8 @@
#include "CBot/CBot.h"
using namespace CBot;
CBotTypResult cMessage(CBotVar* &var, void* user)
{
if ( var == nullptr ) return CBotTypResult(CBotErrLowParam);