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

* WIP on event condition format

Browse Source 
* Hero portrait serialization
* Fix town spells serialization

* Added support for float exponential part in Json
* Added support for int64 in Json
* Added basic Hero definitions serialization
* Added rumors serialization
* Advanced player info serialization.
* Added Disposed heroes serialization, (!) not covered with tests yet
* Added Local event serialization
* Added Pandoras box serialization
* Added Seer hut reward serialization
* Added CQuest serialization
* Added API for map object instance names serialization.
* Added random dwelling options serialization
* Advanced town options serialization
* Advanced hero options serialization
* More map format tests
* A lot of fixes, cleanup and refactoring
This commit is contained in:
AlexVinS
2016-11-13 13:38:42 +03:00
parent 5127061e28
commit a85b4cf2a5
70 changed files with 18728 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mapping/CMapEditManager.cpp
View File

@ -247,9 +247,9 @@ void CMapEditManager::drawRoad(ERoadType::ERoadType roadType, CRandomGenerator*
}
void CMapEditManager::insertObject(CGObjectInstance * obj, const int3 & pos)
void CMapEditManager::insertObject(CGObjectInstance * obj)
{
execute(make_unique<CInsertObjectOperation>(map, obj, pos));
execute(make_unique<CInsertObjectOperation>(map, obj));
}
void CMapEditManager::execute(std::unique_ptr<CMapOperation> && operation)
@ -422,7 +422,7 @@ CTerrainViewPatternConfig::CTerrainViewPatternConfig()
flipPattern(terGroupPattern, i); //FIXME: we flip in place - doesn't make much sense now, but used to work
terrainViewPatternFlips.push_back(terGroupPattern);
}
terrainViewPatterns[terGroup].push_back(terrainViewPatternFlips);
terrainViewPatterns[terGroup].push_back(terrainViewPatternFlips);
}
}
else if(i == 1)
@ -1069,15 +1069,14 @@ std::string CClearTerrainOperation::getLabel() const
return "Clear Terrain";
}
CInsertObjectOperation::CInsertObjectOperation(CMap * map, CGObjectInstance * obj, const int3 & pos)
: CMapOperation(map), pos(pos), obj(obj)
CInsertObjectOperation::CInsertObjectOperation(CMap * map, CGObjectInstance * obj)
: CMapOperation(map), obj(obj)
{
}
void CInsertObjectOperation::execute()
{
obj->pos = pos;
obj->id = ObjectInstanceID(map->objects.size());
boost::format fmt("%s_%d");