Nullkiller: android fixes

AI/Nullkiller/Behaviors/CaptureObjectsBehavior.cpp

@@ -15,8 +15,8 @@
 #include "../Goals/ExecuteHeroChain.h"
 #include "CaptureObjectsBehavior.h"
 #include "../AIUtility.h"
-#include "lib/mapping/CMap.h" //for victory conditions
-#include "lib/CPathfinder.h"
+#include "../../../lib/mapping/CMap.h" //for victory conditions
+#include "../../../lib/CPathfinder.h"
 
 extern boost::thread_specific_ptr<CCallback> cb;
 extern boost::thread_specific_ptr<VCAI> ai;

AI/Nullkiller/Behaviors/CaptureObjectsBehavior.h

@@ -9,7 +9,7 @@
 */
 #pragma once
 
-#include "lib/VCMI_Lib.h"
+#include "../../../lib/VCMI_Lib.h"
 #include "../AIUtility.h"
 #include "../Goals/CGoal.h"
 

AI/Nullkiller/Goals/CGoal.h

@@ -83,12 +83,12 @@ namespace Goals
 	template<typename T> class DLL_EXPORT ElementarGoal : public CGoal<T>, public ITask
 	{
 	public:
-		ElementarGoal<T>(EGoals goal = INVALID) : CGoal(goal), ITask()
+		ElementarGoal<T>(EGoals goal = INVALID) : CGoal<T>(goal), ITask()
 		{
-			isAbstract = false;
+			AbstractGoal::isAbstract = false;
 		}
 
-		ElementarGoal<T>(const ElementarGoal<T> & other) : CGoal(other), ITask(other)
+		ElementarGoal<T>(const ElementarGoal<T> & other) : CGoal<T>(other), ITask(other)
 		{
 		}
 
@@ -101,7 +101,7 @@ namespace Goals
 
 		T & setpriority(float p)
 		{
-			priority = p;
+			ITask::priority = p;
 
 			return *((T *)this);
 		}

AI/Nullkiller/Goals/Composition.cpp

@@ -96,7 +96,7 @@ TGoalVec Composition::decompose() const
 	return result;
 }
 
-Composition & Composition::addNext(AbstractGoal & goal)
+Composition & Composition::addNext(const AbstractGoal & goal)
 {
 	return addNext(sptr(goal));
 }

AI/Nullkiller/Goals/Composition.h

@@ -32,7 +32,7 @@ namespace Goals
 		virtual bool operator==(const Composition & other) const override;
 		virtual std::string toString() const override;
 		void accept(VCAI * ai) override;
-		Composition & addNext(AbstractGoal & goal);
+		Composition & addNext(const AbstractGoal & goal);
 		Composition & addNext(TSubgoal goal);
 		virtual TGoalVec decompose() const override;
 		virtual bool isElementar() const override;

AI/Nullkiller/Pathfinding/AINodeStorage.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#define PATHFINDER_TRACE_LEVEL 1
-#define AI_TRACE_LEVEL 2
+#define PATHFINDER_TRACE_LEVEL 0
+#define AI_TRACE_LEVEL 1
 
 #include "../../../lib/CPathfinder.h"
 #include "../../../lib/mapObjects/CGHeroInstance.h"

AI/Nullkiller/Pathfinding/Actions/SpecialAction.cpp

@@ -8,8 +8,7 @@
 *
 */
 
-#pragma once
-
+#include "StdInc.h"
 #include "SpecialAction.h"
 #include "../../VCAI.h"
 #include "../../Goals/CGoal.h"