games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-10 23:48:04 +02:00
Code Issues Releases Activity

- Fixed compilation errors on clang

Browse Source 
- Removed compiler warnings of unused variables
This commit is contained in:
beegee1 2013-11-16 09:17:19 +00:00
parent 900d7a03f0
commit 39d3102905
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AI/VCAI/Goals.h
View File

@ -114,7 +114,7 @@ public:
} }
}; };
template <typename T = CGoal> class CGoal : public AbstractGoal template <typename T> class CGoal : public AbstractGoal
{ {
public: public:
CGoal<T> (EGoals goal = INVALID) : AbstractGoal (goal) CGoal<T> (EGoals goal = INVALID) : AbstractGoal (goal)
@ -146,11 +146,11 @@ public:
}; };
//There seems to be some ambiguity on these two, template function keeps form consitent //There seems to be some ambiguity on these two, template function keeps form consitent
template <typename T> shared_ptr<CGoal<T>> sptr(CGoal<T>& tmp) template <typename T> shared_ptr<CGoal<T>> sptr(const CGoal<T> & tmp)
{ {
return make_shared<CGoal<T>> (tmp); return make_shared<CGoal<T>> (tmp);
} }
template <typename T> shared_ptr<CGoal<T>> sptr(T& obj) template <typename T> shared_ptr<CGoal<T>> sptr(const T & obj)
{ {
return make_shared<CGoal<T>> (obj); return make_shared<CGoal<T>> (obj);
} }

4
lib/rmg/CZoneGraphGenerator.cpp
View File

@ -12,7 +12,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "CZoneGraphGenerator.h" #include "CZoneGraphGenerator.h"
CZoneCell::CZoneCell(const CRmgTemplateZone * zone) : zone(zone) CZoneCell::CZoneCell(const CRmgTemplateZone * zone)// : zone(zone)
{ {
} }
@ -23,7 +23,7 @@ CZoneGraph::CZoneGraph()
} }
CZoneGraphGenerator::CZoneGraphGenerator() : gen(nullptr) CZoneGraphGenerator::CZoneGraphGenerator()// : gen(nullptr)
{ {
} }

4
lib/rmg/CZoneGraphGenerator.h
View File

@ -21,7 +21,7 @@ public:
explicit CZoneCell(const CRmgTemplateZone * zone); explicit CZoneCell(const CRmgTemplateZone * zone);
private: private:
const CRmgTemplateZone * zone; //const CRmgTemplateZone * zone;
//TODO additional data //TODO additional data
}; };
@ -44,5 +44,5 @@ public:
private: private:
unique_ptr<CZoneGraph> graph; unique_ptr<CZoneGraph> graph;
CRandomGenerator * gen; //CRandomGenerator * gen;
}; };

4
lib/rmg/CZonePlacer.cpp
View File

@ -14,12 +14,12 @@
#include "CZoneGraphGenerator.h" #include "CZoneGraphGenerator.h"
CPlacedZone::CPlacedZone(const CRmgTemplateZone * zone) : zone(zone) CPlacedZone::CPlacedZone(const CRmgTemplateZone * zone)// : zone(zone)
{ {
} }
CZonePlacer::CZonePlacer() : map(nullptr), gen(nullptr) CZonePlacer::CZonePlacer()// : map(nullptr), gen(nullptr)
{ {
} }

6
lib/rmg/CZonePlacer.h
View File

@ -22,7 +22,7 @@ public:
explicit CPlacedZone(const CRmgTemplateZone * zone); explicit CPlacedZone(const CRmgTemplateZone * zone);
private: private:
const CRmgTemplateZone * zone; //const CRmgTemplateZone * zone;
//TODO exact outline data of zone //TODO exact outline data of zone
//TODO perhaps further zone data, guards, obstacles, etc... //TODO perhaps further zone data, guards, obstacles, etc...
@ -39,7 +39,7 @@ public:
void placeZones(CMap * map, unique_ptr<CZoneGraph> graph, CRandomGenerator * gen); void placeZones(CMap * map, unique_ptr<CZoneGraph> graph, CRandomGenerator * gen);
private: private:
CMap * map; //CMap * map;
unique_ptr<CZoneGraph> graph; unique_ptr<CZoneGraph> graph;
CRandomGenerator * gen; //CRandomGenerator * gen;
}; };