From f32668765286ba850d2f15af8e4b30bb6e495627 Mon Sep 17 00:00:00 2001 From: Maikel de Vries Date: Fri, 3 Dec 2010 22:50:51 +0100 Subject: [PATCH] Objects: CTF flag placed correctly w.r.t. base --- .../Goals.c4d/CaptureTheFlag.c4d/Flag.c4d/Script.c | 4 ++-- planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Script.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Flag.c4d/Script.c b/planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Flag.c4d/Script.c index 4000a3304..5d7282b34 100644 --- a/planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Flag.c4d/Script.c +++ b/planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Flag.c4d/Script.c @@ -165,7 +165,7 @@ protected func Destruction() { var flag = CreateObject(Goal_Flag, 0, 0, GetOwner()); flag->SetTeam(GetTeam()); - flag->SetPosition(base->GetX(), base->GetY() - 10); + flag->SetPosition(base->GetX() + 7, base->GetY() - 13); Log("$MsgFlagRestored$", GetTeamName(team)); } return; @@ -188,7 +188,7 @@ private func BeamFlag(bool msg) if (base) { if(ObjectDistance(base) > 30) - SetPosition(base->GetX(), base->GetY() - 13); + SetPosition(base->GetX() + 7, base->GetY() - 13); } else RemoveObject(); diff --git a/planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Script.c b/planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Script.c index c656a7a47..4d3a085b5 100644 --- a/planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Script.c +++ b/planet/Objects.c4d/Goals.c4d/CaptureTheFlag.c4d/Script.c @@ -31,7 +31,7 @@ public func SetFlagBase(int team, int x, int y) var base = CreateObject(Goal_FlagBase, x, y, NO_OWNER); base->SetTeam(team); var flag = CreateObject(Goal_Flag, x, y, NO_OWNER); - flag->SetPosition(x, y - 13); + flag->SetPosition(x + 7, y - 13); flag->SetTeam(team); return; }