2
0
Эх сурвалжийг харах

- fixed Clang compiler warnings

beegee1 11 жил өмнө
parent
commit
c1ac95b288

+ 1 - 1
lib/mapObjects/JsonRandom.cpp

@@ -197,7 +197,7 @@ namespace JsonRandom
 			}
 			const CCreature * crea = VLC->creh->creatures[VLC->modh->identifiers.getIdentifier("creature", node["type"]).get()];
 			info.allowedCreatures.push_back(crea);
-			if (!node["upgradeChance"].Float() > 0)
+            if (node["upgradeChance"].Float() > 0)
 			{
 				for (auto creaID : crea->upgrades)
 					info.allowedCreatures.push_back(VLC->creh->creatures[creaID]);

+ 1 - 1
lib/rmg/CRmgTemplateZone.cpp

@@ -1689,7 +1689,7 @@ void CRmgTemplateZone::addAllPossibleObjects (CMapGenerator* gen)
 
 	//prisons
 	//levels 1, 5, 10, 20, 30
-	static int prisonExp[] = {0, 5000, 15000, 90000, 500000};
+    //static int prisonExp[] = {0, 5000, 15000, 90000, 500000};
 	static int prisonValues[] = {2500, 5000, 10000, 20000, 30000};
 
 	for (int i = 0; i < 5; i++)

+ 1 - 1
lib/rmg/CZonePlacer.cpp

@@ -18,7 +18,7 @@
 
 class CRandomGenerator;
 
-CPlacedZone::CPlacedZone(const CRmgTemplateZone * zone) : zone(zone)
+CPlacedZone::CPlacedZone(const CRmgTemplateZone * zone)
 {
 
 }

+ 2 - 2
lib/rmg/CZonePlacer.h

@@ -29,7 +29,7 @@ public:
 	explicit CPlacedZone(const CRmgTemplateZone * Zone);
 
 private:
-	const CRmgTemplateZone * zone;
+    //const CRmgTemplateZone * zone;
 
 	//TODO exact outline data of zone
 	//TODO perhaps further zone data, guards, obstacles, etc...
@@ -50,7 +50,7 @@ private:
 	//metric coefiicients
 	float scaleX;
 	float scaleY;
-	float a1, b1, c1, a2, b2, c2;
+    //float a1, b1, c1, a2, b2, c2;
 	//CMap * map;
 	//unique_ptr<CZoneGraph> graph;
 	CMapGenerator * gen;