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 bug in campaigns

Browse Source 
* turned off artifacts.json creation
* minor changes
This commit is contained in:
mateuszb
2012-09-29 17:36:48 +00:00
parent 2001aeac92
commit 657ed41088
5 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CObjectHandler.cpp
View File

@ -1535,7 +1535,7 @@ void CGDwelling::initObj()
hoverName = VLC->generaltexth->creGens[subID];
if(crs->level > 4)
putStack(0, new CStackInstance(crs, (crs->growth) * 3));
if (getOwner() != 255)
if (getOwner() != GameConstants::NEUTRAL_PLAYER)
cb->gameState()->players[getOwner()].dwellings.push_back (this);
}
break;
@ -2167,7 +2167,7 @@ ui8 CGTownInstance::getPassableness() const
{
if (!armedGarrison())//empty castle - anyone can visit
return GameConstants::ALL_PLAYERS;
if ( tempOwner == 255 )//neutral guarded - no one can visit
if ( tempOwner == GameConstants::NEUTRAL_PLAYER )//neutral guarded - no one can visit
return 0;
ui8 mask = 0;
@ -5623,7 +5623,7 @@ ui8 CGGarrison::getPassableness() const
{
if ( !stacksCount() )//empty - anyone can visit
return GameConstants::ALL_PLAYERS;
if ( tempOwner == 255 )//neutral guarded - no one can visit
if ( tempOwner == GameConstants::NEUTRAL_PLAYER )//neutral guarded - no one can visit
return 0;
ui8 mask = 0;