소스 검색

Merge pull request #1990 from AlexBarys/AITurretClearIgnoreList

Ai turret clear ignore list
Areloch 8 년 전
부모
커밋
78492438d4
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);