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

Quick fix for 9a33551 since I broke sth

1164-fix
Fiftytwo 2017-11-17 12:00:49 +01:00
parent 9a33551a03
commit 0b36bdf37f
3 changed files with 98 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/cbottoken.cpp
View File

@ -269,7 +269,7 @@ std::string GetHelpFilename(const char *token)
if ( strcmp(token, "trunc" ) == 0 ) helpfile = "cbot/trunc"; if ( strcmp(token, "trunc" ) == 0 ) helpfile = "cbot/trunc";
if ( strcmp(token, "retobject" ) == 0 ) helpfile = "cbot/retobj"; if ( strcmp(token, "retobject" ) == 0 ) helpfile = "cbot/retobj";
if ( strcmp(token, "errmode" ) == 0 ) helpfile = "cbot/errmode"; if ( strcmp(token, "errmode" ) == 0 ) helpfile = "cbot/errmode";
if ( strcmp(token, "busy" ) == 0 ) helpfile = "cbot/busy"; if ( strcmp(token, "isbusy" ) == 0 ) helpfile = "cbot/isbusy";
if ( strcmp(token, "takeoff" ) == 0 ) helpfile = "cbot/takeoff"; if ( strcmp(token, "takeoff" ) == 0 ) helpfile = "cbot/takeoff";
if ( strcmp(token, "research" ) == 0 ) helpfile = "cbot/research"; if ( strcmp(token, "research" ) == 0 ) helpfile = "cbot/research";
if ( strcmp(token, "factory" ) == 0 ) helpfile = "cbot/factory"; if ( strcmp(token, "factory" ) == 0 ) helpfile = "cbot/factory";
@ -420,7 +420,7 @@ bool IsFunction(const char *token)
if ( strcmp(token, "trunc" ) == 0 ) return true; if ( strcmp(token, "trunc" ) == 0 ) return true;
if ( strcmp(token, "retobjectbyid") == 0 ) return true; if ( strcmp(token, "retobjectbyid") == 0 ) return true;
if ( strcmp(token, "retobject" ) == 0 ) return true; if ( strcmp(token, "retobject" ) == 0 ) return true;
if ( strcmp(token, "busy" ) == 0 ) return true; if ( strcmp(token, "isbusy" ) == 0 ) return true;
if ( strcmp(token, "factory" ) == 0 ) return true; if ( strcmp(token, "factory" ) == 0 ) return true;
if ( strcmp(token, "research" ) == 0 ) return true; if ( strcmp(token, "research" ) == 0 ) return true;
if ( strcmp(token, "takeoff" ) == 0 ) return true; if ( strcmp(token, "takeoff" ) == 0 ) return true;
@ -523,11 +523,11 @@ const char* GetHelpText(const char *token)
if ( strcmp(token, "retobject" ) == 0 ) return "retobject ( rank );"; if ( strcmp(token, "retobject" ) == 0 ) return "retobject ( rank );";
if ( strcmp(token, "retobjectbyid") == 0 ) return "retobjectbyid ( rank );"; if ( strcmp(token, "retobjectbyid") == 0 ) return "retobjectbyid ( rank );";
if ( strcmp(token, "progfunc" ) == 0 ) return "progfunc ( funcname );"; if ( strcmp(token, "progfunc" ) == 0 ) return "progfunc ( funcname );";
if ( strcmp(token, "busy" ) == 0 ) return "busy ( );"; if ( strcmp(token, "isbusy" ) == 0 ) return "isbusy ( object );";
if ( strcmp(token, "factory" ) == 0 ) return "factory ( cat, program, object );"; if ( strcmp(token, "factory" ) == 0 ) return "factory ( cat, program, object );";
if ( strcmp(token, "research" ) == 0 ) return "research ( type );"; if ( strcmp(token, "research" ) == 0 ) return "research ( type, object );";
if ( strcmp(token, "takeoff" ) == 0 ) return "takeoff ( );"; if ( strcmp(token, "takeoff" ) == 0 ) return "takeoff ( object );";
if ( strcmp(token, "destroy" ) == 0 ) return "destroy ( );"; if ( strcmp(token, "destroy" ) == 0 ) return "destroy ( object );";
if ( strcmp(token, "search" ) == 0 ) return "search ( cat, pos, min, max, sens, filter );"; if ( strcmp(token, "search" ) == 0 ) return "search ( cat, pos, min, max, sens, filter );";
if ( strcmp(token, "searchall" ) == 0 ) return "searchall ( cat, pos, min, max, sens, filter );"; if ( strcmp(token, "searchall" ) == 0 ) return "searchall ( cat, pos, min, max, sens, filter );";
if ( strcmp(token, "radar" ) == 0 ) return "radar ( cat, angle, focus, min, max, sens, filter );"; if ( strcmp(token, "radar" ) == 0 ) return "radar ( cat, angle, focus, min, max, sens, filter );";

119
src/script/scriptfunc.cpp
View File

@ -357,22 +357,30 @@ bool CScriptFunctions::rGetObject(CBotVar* var, CBotVar* result, int& exception,
return true; return true;
} }
// Compilation of instruction "object.busy()" // Compilation of instruction "isbusy( object )"
CBotTypResult CScriptFunctions::cBusy(CBotVar* thisclass, CBotVar* &var)
CBotTypResult CScriptFunctions::cIsBusy(CBot::CBotVar* &var, void* user)
{ {
if ( var != nullptr ) return CBotTypResult(CBotErrOverParam); if ( var == nullptr ) return CBotTypResult(CBotErrLowParam);
return CBotTypResult(CBotTypBoolean); return CBotTypResult(CBotTypBoolean);
} }
// Instruction "object.busy()" // Instruction "isbusy( object )"
bool CScriptFunctions::rBusy(CBotVar* thisclass, CBotVar* var, CBotVar* result, int& exception, void* user) bool CScriptFunctions::rIsBusy(CBotVar* var, CBotVar* result, int& exception, void* user)
{ {
CObject* pThis = static_cast<CScript*>(user)->m_object; CObject* pThis = static_cast<CScript*>(user)->m_object;
exception = 0; exception = 0;
CObject* obj = static_cast<CObject*>(thisclass->GetUserPtr()); CObject* obj = static_cast<CObject*>(var->GetUserPtr());
if (obj == nullptr)
{
exception = ERR_WRONG_OBJ;
result->SetValInt(ERR_WRONG_OBJ);
return false;
}
CAuto* automat = obj->GetAuto(); CAuto* automat = obj->GetAuto();
if ( pThis->GetTeam() != obj->GetTeam() && obj->GetTeam() != 0 ) if ( pThis->GetTeam() != obj->GetTeam() && obj->GetTeam() != 0 )
@ -390,7 +398,7 @@ bool CScriptFunctions::rBusy(CBotVar* thisclass, CBotVar* var, CBotVar* result,
return true; return true;
} }
bool CScriptFunctions::rDestroy(CBotVar* thisclass, CBotVar* var, CBotVar* result, int& exception, void* user) bool CScriptFunctions::rDestroy(CBotVar* var, CBotVar* result, int& exception, void* user)
{ {
CScript* script = static_cast<CScript*>(user); CScript* script = static_cast<CScript*>(user);
CObject* pThis = script->m_object; CObject* pThis = script->m_object;
@ -398,7 +406,14 @@ bool CScriptFunctions::rDestroy(CBotVar* thisclass, CBotVar* var, CBotVar* resul
exception = 0; exception = 0;
Error err; Error err;
CObject* obj = static_cast<CObject*>(thisclass->GetUserPtr()); CObject* obj = static_cast<CObject*>(var->GetUserPtr());
if (obj == nullptr)
{
exception = ERR_WRONG_OBJ;
result->SetValInt(ERR_WRONG_OBJ);
return false;
}
CAuto* automat = obj->GetAuto(); CAuto* automat = obj->GetAuto();
if ( pThis->GetTeam() != obj->GetTeam() && obj->GetTeam() != 0 ) if ( pThis->GetTeam() != obj->GetTeam() && obj->GetTeam() != 0 )
@ -427,8 +442,7 @@ bool CScriptFunctions::rDestroy(CBotVar* thisclass, CBotVar* var, CBotVar* resul
return true; return true;
} }
// Compilation of instruction "factory(cat[, program , object])"
// Compilation of instruction "factory(cat, program [, object])"
CBotTypResult CScriptFunctions::cFactory(CBotVar* &var, void* user) CBotTypResult CScriptFunctions::cFactory(CBotVar* &var, void* user)
{ {
@ -437,11 +451,11 @@ CBotTypResult CScriptFunctions::cFactory(CBotVar* &var, void* user)
var = var->GetNext(); var = var->GetNext();
if ( var != nullptr ) if ( var != nullptr )
{ {
if ( var->GetType() != CBotTypPointer ) return CBotTypResult(CBotErrBadParam); if ( var->GetType() != CBotTypString ) return CBotTypResult(CBotErrBadParam);
var = var->GetNext(); var = var->GetNext();
if ( var != nullptr ) if ( var != nullptr )
{ {
if ( var->GetType() != CBotTypString ) return CBotTypResult(CBotErrBadParam); if ( var->GetType() != CBotTypPointer ) return CBotTypResult(CBotErrBadParam);
var = var->GetNext(); var = var->GetNext();
if ( var != nullptr ) return CBotTypResult(CBotErrOverParam); if ( var != nullptr ) return CBotTypResult(CBotErrOverParam);
} }
@ -449,7 +463,7 @@ CBotTypResult CScriptFunctions::cFactory(CBotVar* &var, void* user)
return CBotTypResult(CBotTypFloat); return CBotTypResult(CBotTypFloat);
} }
// Instruction "factory(cat, program [, object])" // Instruction "factory(cat[, program , object])"
bool CScriptFunctions::rFactory(CBotVar* var, CBotVar* result, int& exception, void* user) bool CScriptFunctions::rFactory(CBotVar* var, CBotVar* result, int& exception, void* user)
{ {
@ -463,23 +477,28 @@ bool CScriptFunctions::rFactory(CBotVar* var, CBotVar* result, int& exception, v
ObjectType type = static_cast<ObjectType>(var->GetValInt()); ObjectType type = static_cast<ObjectType>(var->GetValInt());
var = var->GetNext(); var = var->GetNext();
CObject* factory = static_cast<CObject*>(var->GetUserPtr());
if (factory == nullptr)
{
exception = ERR_UNKNOWN;
result->SetValInt(ERR_UNKNOWN);
GetLogger()->Error("in factory() - factory is nullptr");
return false;
}
var = var->GetNext();
std::string program; std::string program;
if ( var != nullptr ) if ( var != nullptr )
{
program = var->GetValString(); program = var->GetValString();
var = var->GetNext();
}
else else
program = ""; program = "";
CObject* factory;
if (var == nullptr)
factory = CObjectManager::GetInstancePointer()->FindNearest(pThis, OBJECT_FACTORY);
else
factory = static_cast<CObject*>(var->GetUserPtr());
if (factory == nullptr)
{
exception = ERR_WRONG_OBJ;
result->SetValInt(ERR_WRONG_OBJ);
return false;
}
if ( pThis->GetTeam() != factory->GetTeam() && factory->GetTeam() != 0 ) if ( pThis->GetTeam() != factory->GetTeam() && factory->GetTeam() != 0 )
{ {
exception = ERR_ENEMY_OBJECT; exception = ERR_ENEMY_OBJECT;
@ -528,9 +547,24 @@ bool CScriptFunctions::rFactory(CBotVar* var, CBotVar* result, int& exception, v
return true; return true;
} }
// Instruction "object.research(type)" // Compilation of instruction "research(type[, object])"
bool CScriptFunctions::rResearch(CBotVar* thisclass, CBotVar* var, CBotVar* result, int& exception, void* user) CBotTypResult CScriptFunctions::cResearch(CBotVar* &var, void* user)
{
if ( var == nullptr ) return CBotTypResult(CBotErrLowParam);
if ( var->GetType() > CBotTypDouble ) return CBotTypResult(CBotErrBadNum);
var = var->GetNext();
if ( var != nullptr )
{
if ( var->GetType() != CBotTypPointer ) return CBotTypResult(CBotErrBadParam);
var = var->GetNext();
if ( var != nullptr ) return CBotTypResult(CBotErrOverParam);
}
return CBotTypResult(CBotTypFloat);
}
// Instruction "research(type[, object])"
bool CScriptFunctions::rResearch(CBotVar* var, CBotVar* result, int& exception, void* user)
{ {
CScript* script = static_cast<CScript*>(user); CScript* script = static_cast<CScript*>(user);
CObject* pThis = script->m_object; CObject* pThis = script->m_object;
@ -540,8 +574,21 @@ bool CScriptFunctions::rResearch(CBotVar* thisclass, CBotVar* var, CBotVar* resu
exception = 0; exception = 0;
ResearchType type = static_cast<ResearchType>(var->GetValInt()); ResearchType type = static_cast<ResearchType>(var->GetValInt());
var = var->GetNext();
CObject* center;
if (var == nullptr)
center = CObjectManager::GetInstancePointer()->FindNearest(pThis, OBJECT_RESEARCH);
else
center = static_cast<CObject*>(var->GetUserPtr());
if (center == nullptr)
{
exception = ERR_WRONG_OBJ;
result->SetValInt(ERR_WRONG_OBJ);
return false;
}
CObject* center = static_cast<CObject*>(thisclass->GetUserPtr());
CAuto* automat = center->GetAuto(); CAuto* automat = center->GetAuto();
if ( pThis->GetTeam() != center->GetTeam() && center->GetTeam() != 0 ) if ( pThis->GetTeam() != center->GetTeam() && center->GetTeam() != 0 )
@ -603,7 +650,7 @@ bool CScriptFunctions::rResearch(CBotVar* thisclass, CBotVar* var, CBotVar* resu
return true; return true;
} }
// Instruction "object.takeoff()" // Instruction "takeoff(object)"
bool CScriptFunctions::rTakeOff(CBotVar* var, CBotVar* result, int& exception, void* user) bool CScriptFunctions::rTakeOff(CBotVar* var, CBotVar* result, int& exception, void* user)
{ {
@ -614,6 +661,13 @@ bool CScriptFunctions::rTakeOff(CBotVar* var, CBotVar* result, int& exception, v
exception = 0; exception = 0;
CObject* base = static_cast<CObject*>(var->GetUserPtr()); CObject* base = static_cast<CObject*>(var->GetUserPtr());
if (base == nullptr)
{
exception = ERR_WRONG_OBJ;
result->SetValInt(ERR_WRONG_OBJ);
return false;
}
CAuto* automat = base->GetAuto(); CAuto* automat = base->GetAuto();
if ( pThis->GetTeam() != base->GetTeam() && base->GetTeam() != 0 ) if ( pThis->GetTeam() != base->GetTeam() && base->GetTeam() != 0 )
@ -3304,11 +3358,6 @@ void CScriptFunctions::Init()
bc->AddItem("id", CBotTypResult(CBotTypInt), CBotVar::ProtectionLevel::ReadOnly); bc->AddItem("id", CBotTypResult(CBotTypInt), CBotVar::ProtectionLevel::ReadOnly);
bc->AddItem("team", CBotTypResult(CBotTypInt), CBotVar::ProtectionLevel::ReadOnly); bc->AddItem("team", CBotTypResult(CBotTypInt), CBotVar::ProtectionLevel::ReadOnly);
bc->AddItem("velocity", CBotTypResult(CBotTypClass, "point"), CBotVar::ProtectionLevel::ReadOnly); bc->AddItem("velocity", CBotTypResult(CBotTypClass, "point"), CBotVar::ProtectionLevel::ReadOnly);
bc->AddFunction("busy", rBusy, cBusy);
//bc->AddFunction("factory", rFactory, cFactory);
bc->AddFunction("research", rResearch, cClassOneFloat);
//bc->AddFunction("takeoff", rTakeOff);
bc->AddFunction("destroy", rDestroy, cClassNull);
CBotProgram::AddFunction("endmission",rEndMission,cEndMission); CBotProgram::AddFunction("endmission",rEndMission,cEndMission);
CBotProgram::AddFunction("playmusic", rPlayMusic ,cPlayMusic); CBotProgram::AddFunction("playmusic", rPlayMusic ,cPlayMusic);
@ -3373,9 +3422,11 @@ void CScriptFunctions::Init()
CBotProgram::AddFunction("pencolor", rPenColor, cOneFloat); CBotProgram::AddFunction("pencolor", rPenColor, cOneFloat);
CBotProgram::AddFunction("penwidth", rPenWidth, cOneFloat); CBotProgram::AddFunction("penwidth", rPenWidth, cOneFloat);
CBotProgram::AddFunction("factory", rFactory, cFactory); CBotProgram::AddFunction("factory", rFactory, cFactory);
CBotProgram::AddFunction("camerafocus", rCameraFocus, cOneObject); CBotProgram::AddFunction("camerafocus", rCameraFocus, cOneObject);
CBotProgram::AddFunction("takeoff", rTakeOff, cOneObject); CBotProgram::AddFunction("takeoff", rTakeOff, cOneObject);
CBotProgram::AddFunction("isbusy", rIsBusy, cIsBusy);
CBotProgram::AddFunction("research", rResearch, cResearch);
CBotProgram::AddFunction("destroy", rDestroy, cOneObject);
SetFileAccessHandler(MakeUnique<CBotFileAccessHandlerColobot>()); SetFileAccessHandler(MakeUnique<CBotFileAccessHandlerColobot>());
} }

14
src/script/scriptfunc.h
View File

@ -80,10 +80,9 @@ private:
static CBot::CBotTypResult cTopo(CBot::CBotVar* &var, void* user); static CBot::CBotTypResult cTopo(CBot::CBotVar* &var, void* user);
static CBot::CBotTypResult cMessage(CBot::CBotVar* &var, void* user); static CBot::CBotTypResult cMessage(CBot::CBotVar* &var, void* user);
static CBot::CBotTypResult cPenDown(CBot::CBotVar* &var, void* user); static CBot::CBotTypResult cPenDown(CBot::CBotVar* &var, void* user);
static CBot::CBotTypResult cIsBusy(CBot::CBotVar* &var, void* user);
static CBot::CBotTypResult cFactory(CBot::CBotVar* &var, void* user); static CBot::CBotTypResult cFactory(CBot::CBotVar* &var, void* user);
//static CBot::CBotTypResult cTakeOff(CBot::CBotVar* &var, void* user); static CBot::CBotTypResult cResearch(CBot::CBotVar* &var, void* user);
static CBot::CBotTypResult cOnePoint(CBot::CBotVar* &var, void* user); static CBot::CBotTypResult cOnePoint(CBot::CBotVar* &var, void* user);
static CBot::CBotTypResult cOneObject(CBot::CBotVar* &var, void* user); static CBot::CBotTypResult cOneObject(CBot::CBotVar* &var, void* user);
@ -147,18 +146,15 @@ private:
static bool rPenColor(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user); static bool rPenColor(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static bool rPenWidth(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user); static bool rPenWidth(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static bool rCameraFocus(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user); static bool rCameraFocus(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static bool rIsBusy(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static bool rTakeOff(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user); static bool rTakeOff(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static bool rFactory(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user); static bool rFactory(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static bool rResearch(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static bool rDestroy(CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static CBot::CBotTypResult cBusy(CBot::CBotVar* thisclass, CBot::CBotVar* &var);
static CBot::CBotTypResult cClassNull(CBot::CBotVar* thisclass, CBot::CBotVar* &var); static CBot::CBotTypResult cClassNull(CBot::CBotVar* thisclass, CBot::CBotVar* &var);
static CBot::CBotTypResult cClassOneFloat(CBot::CBotVar* thisclass, CBot::CBotVar* &var); static CBot::CBotTypResult cClassOneFloat(CBot::CBotVar* thisclass, CBot::CBotVar* &var);
static bool rBusy(CBot::CBotVar* thisclass, CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static bool rResearch(CBot::CBotVar* thisclass, CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static bool rDestroy(CBot::CBotVar* thisclass, CBot::CBotVar* var, CBot::CBotVar* result, int& exception, void* user);
static CBot::CBotTypResult cPointConstructor(CBot::CBotVar* pThis, CBot::CBotVar* &var); static CBot::CBotTypResult cPointConstructor(CBot::CBotVar* pThis, CBot::CBotVar* &var);
static bool rPointConstructor(CBot::CBotVar* pThis, CBot::CBotVar* var, CBot::CBotVar* pResult, int& Exception, void* user); static bool rPointConstructor(CBot::CBotVar* pThis, CBot::CBotVar* var, CBot::CBotVar* pResult, int& Exception, void* user);