games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

* improved slider ( #58 )

Browse Source 
* fixed problems with horde buildings (won't block original dwellings)
* giving primary skill when hero get level (but there is still no dialog)
* if an upgraded creature is available it'll be shown as the first in a recruitment window
* creature levels not messed in Fortress
* war machines are added to the hero's inventory, not to the garrison
* support for H3-style PCX graphics in Data/ (not tested)
* started doing support for ZSoft PCX graphics in Data/
* VCMI won't crash when is unable to initialize audio system
* fixed displaying wrong town defs
* minor fixes and improvements
This commit is contained in:
Michał W. Urbańczyk
2008-05-03 15:30:11 +00:00
parent 33e3bf4849
commit 2f2169b71f
14 changed files with 218 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
CMT.cpp
View File

@@ -152,26 +152,33 @@ void initGameState(CGameInfo * cgi)
vhi->portrait = vhi->type->ID;
//initial army
if (!vhi->army.slots.size())
if (!vhi->army.slots.size()) //standard army
{
int pom;
vhi->army.slots[0].first = &(cgi->creh->creatures[(cgi->creh->nameToID[vhi->type->refType1stack])]);
if((pom = (vhi->type->high1stack-vhi->type->low1stack)) > 0)
vhi->army.slots[0].second = (rand()%pom)+vhi->type->low1stack;
else
vhi->army.slots[0].second = +vhi->type->low1stack;
vhi->army.slots[1].first = &(cgi->creh->creatures[(cgi->creh->nameToID[vhi->type->refType2stack])]);
if((pom=(vhi->type->high2stack-vhi->type->low2stack))>0)
vhi->army.slots[1].second = (rand()%pom)+vhi->type->low2stack;
else
vhi->army.slots[1].second = vhi->type->low2stack;
vhi->army.slots[2].first = &(cgi->creh->creatures[(cgi->creh->nameToID[vhi->type->refType3stack])]);
if((pom=(vhi->type->high3stack-vhi->type->low3stack))>0)
vhi->army.slots[2].second = (rand()%pom)+vhi->type->low3stack;
else
vhi->army.slots[2].second = vhi->type->low3stack;
int pom, pom2=0;
for(int x=0;x<3;x++)
{
pom = (cgi->creh->nameToID[vhi->type->refTypeStack[x]]);
if(pom>=145 && pom<=149) //war machine
{
pom2++;
switch (pom)
{
case 145: //catapult
vhi->artifWorn[16] = &CGI->arth->artifacts[3];
break;
default:
pom-=145;
vhi->artifWorn[13+pom] = &CGI->arth->artifacts[4+pom];
break;
}
continue;
}
vhi->army.slots[x-pom2].first = &(cgi->creh->creatures[pom]);
if((pom = (vhi->type->highStack[x]-vhi->type->lowStack[x])) > 0)
vhi->army.slots[x-pom2].second = (rand()%pom)+vhi->type->lowStack[x];
else
vhi->army.slots[x-pom2].second = +vhi->type->lowStack[x];
}
}
cgi->state->players[vhi->getOwner()].heroes.push_back(vhi);