浏览代码

Nullkiller: fix build and warnings

Andrii Danylchenko 4 年之前
父节点
当前提交
682707e4f1
共有 2 个文件被更改,包括 6 次插入3 次删除
  1. 5 2
      AI/Nullkiller/Behaviors/CaptureObjectsBehavior.cpp
  2. 1 1
      AI/Nullkiller/Engine/Nullkiller.cpp

+ 5 - 2
AI/Nullkiller/Behaviors/CaptureObjectsBehavior.cpp

@@ -131,12 +131,15 @@ bool CaptureObjectsBehavior::shouldVisitObject(ObjectIdRef obj) const
 {
 	const CGObjectInstance* objInstance = obj;
 
-	if(!objInstance || objectTypes.size() && !vstd::contains(objectTypes, objInstance->ID.num))
+	if(!objInstance)
+		return false;
+
+	if(objectTypes.size() && !vstd::contains(objectTypes, objInstance->ID.num))
 	{
 		return false;
 	}
 
-	if(!objInstance || objectSubTypes.size() && !vstd::contains(objectSubTypes, objInstance->subID))
+	if(objectSubTypes.size() && !vstd::contains(objectSubTypes, objInstance->subID))
 	{
 		return false;
 	}

+ 1 - 1
AI/Nullkiller/Engine/Nullkiller.cpp

@@ -10,7 +10,7 @@
 #include "StdInc.h"
 #include "Nullkiller.h"
 #include "../VCAI.h"
-#include "../AIHelper.h"
+#include "../AIhelper.h"
 #include "../Behaviors/CaptureObjectsBehavior.h"
 #include "../Behaviors/RecruitHeroBehavior.h"
 #include "../Behaviors/BuyArmyBehavior.h"