games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +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/mapObjects/CObjectHandler.cpp
View File

@@ -257,7 +257,7 @@ int3 CGObjectInstance::getSightCenter() const
return visitablePos();
}
int CGObjectInstance::getSightRadious() const
int CGObjectInstance::getSightRadius() const
{
return 3;
}