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

Removed CheckVisibility from Commits.c and made the engine function C4Object::IsVisible available instead.

Julius Michaelis 2011-09-05 13:51:34 +00:00
parent bbf422173d
commit f389ee0781
2 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
planet/System.ocg/Commits.c
View File

@ -219,47 +219,6 @@ global func CastPXS(string mat, int am, int lev, int x, int y, int angs, int ang
return;
}
global func CheckVisibility(int plr)
{
var visible = this["Visibility"];
if (GetType(visible) == C4V_Array)
visible = visible[0];
// Not visible at all.
if (visible == VIS_None)
return false;
// Visible for all.
if (visible == VIS_All)
return true;
// Object is owned by the indicated player.
if (GetOwner() == plr)
{
if (visible & VIS_Owner)
return true;
}
// Object belongs to a player, hostile to plr.
else if (Hostile(GetOwner(), plr))
{
if (visible & VIS_Enemies)
return true;
}
// Object belongs to a player, friendly to plr.
else
{
if (visible & VIS_Allies)
return true;
}
if (visible & VIS_Select)
if (this["Visibility"][1 + plr / 32] & 1 << plr)
return true;
return false;
}
global func MaterialDepthCheck(int x, int y, string mat, int depth)
{
var travelled;

5
src/game/object/C4ObjectScript.cpp
View File

@ -1377,6 +1377,10 @@ static C4String *FnGetProcedure(C4AulObjectContext *cthr)
return pActionDef->GetPropertyStr(P_Procedure);
}
static bool FnCheckVisibility(C4AulObjectContext *cthr, int plr) {
return cthr->Obj->IsVisible(plr, false);
}
static bool FnSetClrModulation(C4AulObjectContext *cthr, Nillable<long> dwClr, long iOverlayID)
{
uint32_t clr = 0xffffffff;
@ -2451,6 +2455,7 @@ void InitObjectFunctionMap(C4AulScriptEngine *pEngine)
AddFunc(pEngine, "SetGraphics", FnSetGraphics);
AddFunc(pEngine, "ObjectNumber", FnObjectNumber);
AddFunc(pEngine, "ShowInfo", FnShowInfo);
AddFunc(pEngine, "CheckVisibility", FnCheckVisibility);
AddFunc(pEngine, "SetClrModulation", FnSetClrModulation);
AddFunc(pEngine, "GetClrModulation", FnGetClrModulation);
AddFunc(pEngine, "CloseMenu", FnCloseMenu);