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

* spell books tend won't be placed in War Machine slots.

Browse Source 
[Use ->getArt function to check if artifact is present, NOT ->artifWorn[slot]!!!]
* Rampart's Treasury requires Miner's Guild 
* fixed hanging scrollbar and related crash
* fixed crash when hero get level and has less than two sec. skills to choose between
This commit is contained in:
Michał W. Urbańczyk
2009-02-04 03:55:12 +00:00
parent 680993459a
commit 886ab94708
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/CGameHandler.cpp
View File

@@ -2095,17 +2095,17 @@ void CGameHandler::setupBattle( BattleInfo * curB, int3 tile, CCreatureSet &army
//adding war machines
if(hero1)
{
if(hero1->artifWorn[13]) //ballista
if(hero1->getArt(13)) //ballista
{
stacks.push_back(new CStack(&VLC->creh->creatures[146], 1, hero1->tempOwner, stacks.size(), true, 255));
stacks[stacks.size()-1]->position = 52;
}
if(hero1->artifWorn[14]) //ammo cart
if(hero1->getArt(14)) //ammo cart
{
stacks.push_back(new CStack(&VLC->creh->creatures[148], 1, hero1->tempOwner, stacks.size(), true, 255));
stacks[stacks.size()-1]->position = 18;
}
if(hero1->artifWorn[15]) //first aid tent
if(hero1->getArt(15)) //first aid tent
{
stacks.push_back(new CStack(&VLC->creh->creatures[147], 1, hero1->tempOwner, stacks.size(), true, 255));
stacks[stacks.size()-1]->position = 154;
@@ -2113,17 +2113,17 @@ void CGameHandler::setupBattle( BattleInfo * curB, int3 tile, CCreatureSet &army
}
if(hero2)
{
if(hero2->artifWorn[13]) //ballista
if(hero1->getArt(13)) //ballista
{
stacks.push_back(new CStack(&VLC->creh->creatures[146], 1, hero2->tempOwner, stacks.size(), false, 255));
stacks[stacks.size()-1]->position = 66;
}
if(hero2->artifWorn[14]) //ammo cart
if(hero2->getArt(14)) //ammo cart
{
stacks.push_back(new CStack(&VLC->creh->creatures[148], 1, hero2->tempOwner, stacks.size(), false, 255));
stacks[stacks.size()-1]->position = 32;
}
if(hero2->artifWorn[15]) //first aid tent
if(hero2->getArt(15)) //first aid tent
{
stacks.push_back(new CStack(&VLC->creh->creatures[147], 1, hero2->tempOwner, stacks.size(), false, 255));
stacks[stacks.size()-1]->position = 168;