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

Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1

Browse Source 
Conflicts:
	lib/VCMI_lib.cbp
	lib/filesystem/CZipLoader.cpp
	lib/filesystem/CZipLoader.h
	lib/mapObjects/CGTownInstance.cpp
This commit is contained in:
AlexVinS
2016-02-04 10:27:51 +03:00
parent 97f19b5176 e7b639898e
commit 6e205a58b4
103 changed files with 1562 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapping/CMap.cpp
View File

@ -215,7 +215,7 @@ CMapHeader::~CMapHeader()
}
CMap::CMap() : checksum(0), grailPos(-1, -1, -1), grailRadious(0), terrain(nullptr)
CMap::CMap() : checksum(0), grailPos(-1, -1, -1), grailRadius(0), terrain(nullptr)
{
allHeroes.resize(allowedHeroes.size());
allowedAbilities = VLC->heroh->getDefaultAllowedAbilities();