1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00

* fixed crash when there was no hero available to hire for some player

* pregmae wont crash if user gives wrong resolution number
* fixed 1024x600 screen resolution
* selection dialog (eg. for treasure chests) can be closed with enter key
* orientation of hero can't be change if movement points are exhausted
* numerous improvements for Tavern window (hover tips for buttons, button will be inactive if player has 8 heroes or there is a visiting hero in the town garrison)
* campfire, borderguard, bordergate, questguard will be accessible from the top
* spells not known by hero can't be casted
* restored checking mana points before casting spell
This commit is contained in:
Michał W. Urbańczyk
2009-02-09 16:18:48 +00:00
parent 445653c880
commit c83404a375
15 changed files with 167 additions and 59 deletions

View File

@ -306,25 +306,33 @@ void CGeneralTextHandler::load()
}
itr = 0;
std::string strin2 = bitmaph->getTextFile("JKTEXT.TXT");
strin = bitmaph->getTextFile("JKTEXT.TXT");
for(int hh=0; hh<45; ++hh)
{
loadToIt(tmp, strin2, itr, 3);
loadToIt(tmp, strin, itr, 3);
jktexts.push_back(tmp);
}
itr = 0;
std::string strin3 = bitmaph->getTextFile("HEROSCRN.TXT");
strin = bitmaph->getTextFile("TVRNINFO.TXT");
for(int hh=0; hh<8; ++hh)
{
loadToIt(tmp, strin, itr, 3);
tavernInfo.push_back(tmp);
}
itr = 0;
strin = bitmaph->getTextFile("HEROSCRN.TXT");
for(int hh=0; hh<33; ++hh)
{
loadToIt(tmp, strin3, itr, 3);
loadToIt(tmp, strin, itr, 3);
heroscrn.push_back(tmp);
}
strin3 = bitmaph->getTextFile("ARTEVENT.TXT");
for(itr = 0; itr<strin3.size();itr++)
strin = bitmaph->getTextFile("ARTEVENT.TXT");
for(itr = 0; itr<strin.size();itr++)
{
loadToIt(tmp, strin3, itr, 3);
loadToIt(tmp, strin, itr, 3);
artifEvents.push_back(tmp);
}