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

* fixes for MSVC (it needs to have global variables from library explicitly exported)

Browse Source 
* renamed logging variables to tlogX ('_' in var names looks ugly)
* cleaned it improved setting formations
* fixed crashbug on maps with random hero
This commit is contained in:
Michał W. Urbańczyk
2008-09-19 08:16:19 +00:00
parent a1dd7f22f9
commit 856698bd80
21 changed files with 171 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Connection.cpp
View File

@@ -46,27 +46,27 @@ CConnection::CConnection(std::string host, std::string port, std::string Name, s
tcp::resolver::iterator end, pom, endpoint_iterator = resolver.resolve(tcp::resolver::query(host,port),error);
if(error)
{
_log1 << "Problem with resolving: " << std::endl << error <<std::endl;
tlog1 << "Problem with resolving: " << std::endl << error <<std::endl;
goto connerror1;
}
pom = endpoint_iterator;
if(pom != end)
_log0<<"Found endpoints:" << std::endl;
tlog0<<"Found endpoints:" << std::endl;
else
{
_log1 << "Critical problem: No endpoints found!" << std::endl;
tlog1 << "Critical problem: No endpoints found!" << std::endl;
goto connerror1;
}
i=0;
while(pom != end)
{
_log0 << "\t" << i << ": " << (boost::asio::ip::tcp::endpoint&)*pom << std::endl;
tlog0 << "\t" << i << ": " << (boost::asio::ip::tcp::endpoint&)*pom << std::endl;
pom++;
}
i=0;
while(endpoint_iterator != end)
{
_log0 << "Trying connection to " << (boost::asio::ip::tcp::endpoint&)*endpoint_iterator << " (" << i++ << ")" << std::endl;
tlog0 << "Trying connection to " << (boost::asio::ip::tcp::endpoint&)*endpoint_iterator << " (" << i++ << ")" << std::endl;
socket->connect(*endpoint_iterator, error);
if(!error)
{
@@ -75,18 +75,18 @@ CConnection::CConnection(std::string host, std::string port, std::string Name, s
}
else
{
_log1 << "Problem with connecting: " << std::endl << error << std::endl;
tlog1 << "Problem with connecting: " << std::endl << error << std::endl;
}
endpoint_iterator++;
}
//we shouldn't be here - error handling
connerror1:
_log1 << "Something went wrong... checking for error info" << std::endl;
tlog1 << "Something went wrong... checking for error info" << std::endl;
if(error)
std::cout << error <<std::endl;
else
_log1 << "No error info. " << std::endl;
tlog1 << "No error info. " << std::endl;
delete io_service;
//delete socket;
throw std::string("Can't establish connection :(");