From: Jānis Rūcis <parasti@gmail.com>
Date: Wed, 14 Jul 2010 01:34:43 +0000 (+0300)
Subject: When connecting entities, don't reuse the target field to name the entity
X-Git-Tag: xonotic-v0.5.0~248^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5dafde957a07dc4ead1486bdb78a11a1ef9d23bf;p=xonotic%2Fnetradiant.git

When connecting entities, don't reuse the target field to name the entity

If an entity already has a target field, chances are that the targeted
entity still exists and the mapper will just get a naming collision.
---

diff --git a/plugins/entity/entity.cpp b/plugins/entity/entity.cpp
index ec02abda..36d7e919 100644
--- a/plugins/entity/entity.cpp
+++ b/plugins/entity/entity.cpp
@@ -234,10 +234,6 @@ public:
     {
       ConnectEntities connector(e1, e2, index);
       const char* value = e2->getKeyValue("targetname");
-      if(string_empty(value))
-      {
-        value = e1->getKeyValue(connector.keyname());
-      }
       if(!string_empty(value))
       {
         connector.connect(value);