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

Fixed #658 and #699.

Browse Source 
Checking for water availability won't cause spurious warnings. New creature window enabled for testing.
This commit is contained in:
Michał W. Urbańczyk 2011-05-25 14:48:49 +00:00
parent 601bee9c0f
commit 8e57dba850
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -8,12 +8,14 @@ GENERAL:
- Ambassador's Sash - Ambassador's Sash
TOWNS: TOWNS:
* Implemented animation for new town buildings
* It's possible to sell artifacts at Artifact Merchants * It's possible to sell artifacts at Artifact Merchants
BATTLES: BATTLES:
* Neutral monsters will be splitted to multiple stacks * Neutral monsters will be splitted to multiple stacks
* Hero can surrender battle to keep army * Hero can surrender battle to keep army
* Support for Death Stare, Support for Poison, Age, Disease, Acid Breath
* Partial support for Stone Gaze, Paralyze, Mana drain

2
client/CPlayerInterface.cpp
View File

@ -486,6 +486,8 @@ void CPlayerInterface::heroVisitsTown(const CGHeroInstance* hero, const CGTownIn
{ {
if(hero->tempOwner != playerID ) if(hero->tempOwner != playerID )
return; return;
waitWhileDialog();
boost::unique_lock<boost::recursive_mutex> un(*pim); boost::unique_lock<boost::recursive_mutex> un(*pim);
openTownWindow(town); openTownWindow(town);
} }

1
config/settings.txt
View File

@ -13,6 +13,7 @@ clientSettings
defaultPlayerAI=GeniusAI; defaultPlayerAI=GeniusAI;
neutralBattleAI=StupidAI; neutralBattleAI=StupidAI;
showFPS=0; showFPS=0;
classicCreatureWindow=0;
} }
GUISettings GUISettings
{ {

3
lib/CObjectHandler.cpp
View File

@ -6313,8 +6313,7 @@ int3 IBoatGenerator::bestLocation() const
for (int i = 0; i < offsets.size(); ++i) for (int i = 0; i < offsets.size(); ++i)
{ {
const TerrainTile *tile = IObjectInterface::cb->getTile(o->pos + offsets[i]); if (const TerrainTile *tile = IObjectInterface::cb->getTile(o->pos + offsets[i], false)) //tile is in the map
if (tile) //tile is in the map
{ {
if (tile->tertype == TerrainTile::water && (!tile->blocked || tile->blockingObjects.front()->ID == 8)) //and is water and is not blocked or is blocked by boat if (tile->tertype == TerrainTile::water && (!tile->blocked || tile->blockingObjects.front()->ID == 8)) //and is water and is not blocked or is blocked by boat
return o->pos + offsets[i]; return o->pos + offsets[i];

20
lib/NetPacksLib.cpp
View File

@ -1253,24 +1253,24 @@ DLL_EXPORT void StacksHealedOrResurrected::applyGs( CGameState *gs )
if(resurrected) if(resurrected)
{ {
for (BonusList::iterator it = changedStack->bonuses.begin(); it != changedStack->bonuses.end(); it++) // for (BonusList::iterator it = changedStack->bonuses.begin(); it != changedStack->bonuses.end(); it++)
{ // {
if(VLC->spellh->spells[(*it)->sid]->positiveness < 0) // if(VLC->spellh->spells[(*it)->sid]->positiveness < 0)
{ // {
changedStack->bonuses.erase(it); // changedStack->bonuses.erase(it);
} // }
} // }
//removing all features from negative spells //removing all features from negative spells
BonusList tmpFeatures = changedStack->bonuses; BonusList tmpFeatures = changedStack->bonuses;
changedStack->bonuses.clear(); //changedStack->bonuses.clear();
BOOST_FOREACH(Bonus *b, tmpFeatures) BOOST_FOREACH(Bonus *b, tmpFeatures)
{ {
const CSpell *s = b->sourceSpell(); const CSpell *s = b->sourceSpell();
if(s && s->positiveness >= 0) if(s && s->positiveness < 0)
{ {
changedStack->addNewBonus(b); changedStack->removeBonus(b);
} }
} }
} }