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

Flag: Bugfix when dropping flag

MimmoO 2010-12-07 22:03:41 +01:00
parent 2e87139fcb
commit cec22c135c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Flag.c4d/Script.c
View File

@ -96,7 +96,7 @@ protected func FxFlagAutoPickupTimer(object target, int num)
if(target->GetAction() == "AttachCarrier")
return 1;
var clnk = FindObjects(Find_ID(Clonk),Find_Distance(20));
var clnk = FindObjects(Find_ID(Clonk),Find_Distance(20),Find_OCF(OCF_Alive));
if(GetLength(clnk) == 0) return 1;
var r=Random(GetLength(clnk));
if(!clnk[r]) return 1;
@ -171,6 +171,7 @@ protected func FxFlagCarriedStop(object target, int num, int reason, bool temp)
this.Visibility = VIS_All;
if (reason == 4)
SetAction("Idle");
Log("$MsgFlagDropped$", GetTaggedTeamName(GetPlayerTeam(target->GetOwner())), GetTaggedTeamName(team));
if (target)
{
target->DetachMesh(EffectVar(0, target, num));