games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-31 22:05:10 +02:00
Code Issues Releases Activity

- fixed Clang compiler warnings

Browse Source
This commit is contained in:
beegee1 2014-08-04 20:36:00 +02:00
parent 12126754fb
commit c1ac95b288
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapObjects/JsonRandom.cpp
View File

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

2
lib/rmg/CRmgTemplateZone.cpp
View File

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

2
lib/rmg/CZonePlacer.cpp
View File

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

4
lib/rmg/CZonePlacer.h
View File

@ -29,7 +29,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...
@ -50,7 +50,7 @@ private:
//metric coefiicients //metric coefiicients
float scaleX; float scaleX;
float scaleY; float scaleY;
float a1, b1, c1, a2, b2, c2; //float a1, b1, c1, a2, b2, c2;
//CMap * map; //CMap * map;
//unique_ptr<CZoneGraph> graph; //unique_ptr<CZoneGraph> graph;
CMapGenerator * gen; CMapGenerator * gen;