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

- gcc/Linux fixes

Browse Source 
- added --nointro parameter to skip intro videos
- minor fixes to scenario selection menu
This commit is contained in:
Ivan Savenko
2011-03-19 22:27:05 +00:00
parent 7b9e77f899
commit 7209f158a1
14 changed files with 96 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server/CGameHandler.cpp
View File

@ -1212,23 +1212,23 @@ void CGameHandler::run(bool resume)
boost::this_thread::sleep(boost::posix_time::milliseconds(5)); //give time client to close socket
}
namespace CGH
{
using namespace std;
static void readItTo(ifstream & input, vector< vector<int> > & dest) //reads 7 lines, i-th one containing i integers, and puts it to dest
{
for(int j=0; j<7; ++j)
{
std::vector<int> pom;
for(int g=0; g<j+1; ++g)
{
int hlp; input>>hlp;
pom.push_back(hlp);
}
dest.push_back(pom);
}
}
}
//namespace CGH
//{
// using namespace std;
// static void readItTo(ifstream & input, vector< vector<int> > & dest) //reads 7 lines, i-th one containing i integers, and puts it to dest
// {
// for(int j=0; j<7; ++j)
// {
// std::vector<int> pom;
// for(int g=0; g<j+1; ++g)
// {
// int hlp; input>>hlp;
// pom.push_back(hlp);
// }
// dest.push_back(pom);
// }
// }
//}
void CGameHandler::setupBattle( int3 tile, const CArmedInstance *armies[2], const CGHeroInstance *heroes[2], bool creatureBank, const CGTownInstance *town )
{