games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-01 00:45:26 +02:00
Code Issues Releases Activity

- Fixed some warnings from cppcheck

Browse Source 
- Minor improvements to JSON validation
- Cleanup in SDL_Extensions.cpp
- Implemented new propery for creature format: idle animation duration
- Disabled idle animation of some of conflux creatures (was clearly
broken)
This commit is contained in:
Ivan Savenko
2013-11-06 13:42:58 +00:00
parent 86b7feeab3
commit 71d6b0fea9
24 changed files with 159 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/CObjectHandler.cpp
View File

@ -294,15 +294,14 @@ PlayerColor CGObjectInstance::getOwner() const
return tempOwner; //won't have owner
}
CGObjectInstance::CGObjectInstance()
CGObjectInstance::CGObjectInstance():
pos(-1,-1,-1),
ID(Obj::NO_OBJ),
subID(-1),
defInfo(nullptr),
tempOwner(PlayerColor::UNFLAGGABLE),
blockVisit(false)
{
pos = int3(-1,-1,-1);
//state = new CLuaObjectScript();
ID = Obj::NO_OBJ;
subID = -1;
defInfo = nullptr;
tempOwner = PlayerColor::UNFLAGGABLE;
blockVisit = false;
}
CGObjectInstance::~CGObjectInstance()
{
@ -1036,17 +1035,17 @@ void CGHeroInstance::initObj()
const CCreature &specCreature = *VLC->creh->creatures[spec.additionalinfo]; //creature in which we have specialty
int creLevel = specCreature.level;
if(!creLevel)
{
if(spec.additionalinfo == 146)
creLevel = 5; //treat ballista as 5-level
else
{
logGlobal->warnStream() << "Warning: unknown level of " << specCreature.namePl;
continue;
}
}
//int creLevel = specCreature.level;
//if(!creLevel)
//{
// if(spec.additionalinfo == 146)
// creLevel = 5; //treat ballista as 5-level
// else
// {
// logGlobal->warnStream() << "Warning: unknown level of " << specCreature.namePl;
// continue;
// }
//}
//bonus->additionalInfo = spec.additionalinfo; //creature id, should not be used again - this works only with limiter
bonus->limiter.reset(new CCreatureTypeLimiter (specCreature, true)); //with upgrades