Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/gameconnection.cc')
-rw-r--r--src/core/gameconnection.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/core/gameconnection.cc b/src/core/gameconnection.cc
index ce33dc6..3167790 100644
--- a/src/core/gameconnection.cc
+++ b/src/core/gameconnection.cc
@@ -100,20 +100,16 @@ Info *GameConnection::info(unsigned int id)
// find the info record
Info *info = Info::find(id);
- if (info) {
- if (!info->timestamp() || (connection_timestamp - info->timestamp()) < INFOTIMEOUT)
- return info;
- } else {
+ if (!info) {
info = new Info(id);
- info->add_text("Requesting information...");
}
-
+ if ( !info->timestamp() || (connection_timestamp < info->timestamp() + INFOTIMEOUT) )
+ return info;
+
// send an information request to the server
if (connection_network) {
- //con_debug << "Requesting info for " << info->id() << std::endl;
info->set_timestamp(connection_timestamp);
-
connection_network->send_info_request(info);
connection_network->transmit();
} else {
@@ -121,9 +117,9 @@ Info *GameConnection::info(unsigned int id)
info->set_timestamp(0);
}
return info;
-
}
+/*
Info *GameConnection::info(const std::string &type, const std::string &label)
{
if (!type.size()) {
@@ -166,6 +162,7 @@ Info *GameConnection::info(const std::string &type, const std::string &label)
}
return info;
}
+*/
void GameConnection::abort()
{