games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Nullkiller: android fixes

Browse Source
This commit is contained in:
Andrii Danylchenko
2021-05-16 14:45:35 +03:00
committed by Andrii Danylchenko
parent e95ccda5de
commit dec723b4be
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AI/Nullkiller/Behaviors/CaptureObjectsBehavior.cpp
View File

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

2
AI/Nullkiller/Behaviors/CaptureObjectsBehavior.h
View File

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

8
AI/Nullkiller/Goals/CGoal.h
View File

@@ -83,12 +83,12 @@ namespace Goals
template<typename T> class DLL_EXPORT ElementarGoal : public CGoal<T>, public ITask template<typename T> class DLL_EXPORT ElementarGoal : public CGoal<T>, public ITask
{ {
public: 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) T & setpriority(float p)
{ {
priority = p; ITask::priority = p;
return *((T *)this); return *((T *)this);
} }

2
AI/Nullkiller/Goals/Composition.cpp
View File

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

2
AI/Nullkiller/Goals/Composition.h
View File

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

4
AI/Nullkiller/Pathfinding/AINodeStorage.h
View File

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

3
AI/Nullkiller/Pathfinding/Actions/SpecialAction.cpp
View File

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