games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Merged Ivan's changes from trunk (r1921)

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-01-28 02:33:26 +00:00
parent e5bf71538f 551d1f1b26
commit 15011e611d
8 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/CGeneralTextHandler.cpp
View File

@@ -393,6 +393,7 @@ void CGeneralTextHandler::load()
for(int hh=0; hh<45; ++hh)
{
loadToIt(tmp, strin, itr, 3);
trimQuotation(tmp);
jktexts.push_back(tmp);
}
@@ -404,6 +405,14 @@ void CGeneralTextHandler::load()
tavernInfo.push_back(tmp);
}
itr = 0;
strin = bitmaph->getTextFile("TURNDUR.TXT");
for(int hh=0; hh<11; ++hh)
{
loadToIt(tmp, strin, itr, 3);
turnDurations.push_back(tmp);
}
itr = 0;
strin = bitmaph->getTextFile("HEROSCRN.TXT");
for(int hh=0; hh<33; ++hh)
@@ -491,13 +500,7 @@ void CGeneralTextHandler::load()
for (i = 0; i < 2; ++i) //gap description
loadToIt(dump,buf,it,3);
seerNames.resize(48);
for (i = 0; i < 14; ++i) //additional tabs
{
loadToIt(seerNames[i], buf, it, 4);
loadToIt(dump, buf, it, 3);
}
for (i = 14; i < 48; ++i)
for (i = 0; i < 48; ++i)
loadToIt(seerNames[i], buf, it, 3);
//campaigns