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

Added object.team in CBot

master
krzys-h 2015-07-07 18:11:28 +02:00
parent f94519b240
commit 9a873c9bea
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/object/old_object.cpp
View File

@ -176,6 +176,10 @@ void uObject(CBotVar* botThis, void* user)
pVar = pVar->GetNext(); // "id" pVar = pVar->GetNext(); // "id"
value = object->GetID(); value = object->GetID();
pVar->SetValInt(value); pVar->SetValInt(value);
pVar = pVar->GetNext(); // "team"
value = object->GetTeam();
pVar->SetValInt(value);
} }

1
src/script/scriptfunc.cpp
View File

@ -3890,6 +3890,7 @@ void CScriptFunctions::Init()
bc->AddItem("energyCell", CBotTypResult(CBotTypPointer, "object"), PR_READ); bc->AddItem("energyCell", CBotTypResult(CBotTypPointer, "object"), PR_READ);
bc->AddItem("load", CBotTypResult(CBotTypPointer, "object"), PR_READ); bc->AddItem("load", CBotTypResult(CBotTypPointer, "object"), PR_READ);
bc->AddItem("id", CBotTypResult(CBotTypInt), PR_READ); bc->AddItem("id", CBotTypResult(CBotTypInt), PR_READ);
bc->AddItem("team", CBotTypResult(CBotTypInt), PR_READ);
bc->AddFunction("busy", CScriptFunctions::rBusy, CScriptFunctions::cBusy); bc->AddFunction("busy", CScriptFunctions::rBusy, CScriptFunctions::cBusy);
bc->AddFunction("factory", CScriptFunctions::rFactory, CScriptFunctions::cFactory); bc->AddFunction("factory", CScriptFunctions::rFactory, CScriptFunctions::cFactory);
bc->AddFunction("research", CScriptFunctions::rResearch, CScriptFunctions::cClassOneFloat); bc->AddFunction("research", CScriptFunctions::rResearch, CScriptFunctions::cClassOneFloat);