marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make script function GetMaterialVal work as documented in the reference

Tobias Zwick 2012-10-27 19:35:25 +02:00
parent d45d767a39
commit 9d85a0e79c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gamescript/C4GameScript.cpp
View File

@ -1406,7 +1406,7 @@ static C4Value FnGetPlayerInfoCoreVal(C4PropList * _this, C4String * strEntry, C
iEntryNr, *pPlayerInfoCore);
}
static C4Value FnGetMaterialVal(C4PropList * _this, C4String * strEntry, C4String * strSection, int iMat, int iEntryNr)
static C4Value FnGetMaterialVal(C4PropList * _this, C4String * strEntry, C4String* strSection, int iMat, int iEntryNr)
{
if (iMat < 0 || iMat >= ::MaterialMap.Num) return C4Value();
@ -1416,11 +1416,8 @@ static C4Value FnGetMaterialVal(C4PropList * _this, C4String * strEntry, C4Strin
// get plr info core
C4MaterialCore* pMaterialCore = static_cast<C4MaterialCore*>(pMaterial);
// material core implicates section "Material"
if (!SEqual(FnStringPar(strSection), "Material")) return C4Value();
// get value
return GetValByStdCompiler(FnStringPar(strEntry), NULL, iEntryNr, *pMaterialCore);
return GetValByStdCompiler(FnStringPar(strEntry), strSection ? strSection->GetCStr() : NULL, iEntryNr, *pMaterialCore);
}
static C4String *FnMaterialName(C4PropList * _this, long iMat)