浏览代码

Merge pull request #1990 from AlexBarys/AITurretClearIgnoreList

Ai turret clear ignore list
Areloch 8 年之前
父节点
当前提交
1b95038fc5
共有 2 个文件被更改,包括 13 次插入0 次删除
  1. 12 0
      Engine/source/T3D/turret/aiTurretShape.cpp
  2. 1 0
      Engine/source/T3D/turret/aiTurretShape.h

+ 12 - 0
Engine/source/T3D/turret/aiTurretShape.cpp

@@ -564,6 +564,11 @@ void AITurretShape::removeFromIgnoreList(ShapeBase* obj)
    mIgnoreObjects.removeObject(obj);
    mIgnoreObjects.removeObject(obj);
 }
 }
 
 
+void AITurretShape::clearIgnoreList()
+{
+   mIgnoreObjects.clear();
+}
+
 S32 AITurretShape::ignoreListCount()
 S32 AITurretShape::ignoreListCount()
 {
 {
    return mIgnoreObjects.size();
    return mIgnoreObjects.size();
@@ -1254,6 +1259,13 @@ DefineEngineMethod( AITurretShape, removeFromIgnoreList, void, (ShapeBase* obj),
    object->removeFromIgnoreList(obj);
    object->removeFromIgnoreList(obj);
 }
 }
 
 
+DefineEngineMethod( AITurretShape, clearIgnoreList, void, (),,
+   "@brief Removes all objects from the turret's ignore list.\n\n"
+   "All objects in this list will be ignored by the turret's targeting.\n")
+{
+   object->clearIgnoreList();
+}
+
 DefineEngineMethod( AITurretShape, ignoreListCount, S32, (),,
 DefineEngineMethod( AITurretShape, ignoreListCount, S32, (),,
    "@brief Returns the number of objects in the turrets ignore list.\n\n"
    "@brief Returns the number of objects in the turrets ignore list.\n\n"
    "All objects in this list will be ignored by the turret's targeting.\n")
    "All objects in this list will be ignored by the turret's targeting.\n")

+ 1 - 0
Engine/source/T3D/turret/aiTurretShape.h

@@ -257,6 +257,7 @@ public:
 
 
    void addToIgnoreList(ShapeBase* obj);
    void addToIgnoreList(ShapeBase* obj);
    void removeFromIgnoreList(ShapeBase* obj);
    void removeFromIgnoreList(ShapeBase* obj);
+   void clearIgnoreList();
    S32  ignoreListCount();
    S32  ignoreListCount();
    SimObject* getIgnoreListObject(S32 index);  
    SimObject* getIgnoreListObject(S32 index);