Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/core/gameconnection.cc
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/core/gameconnection.cc')
-rw-r--r--src/core/gameconnection.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/gameconnection.cc b/src/core/gameconnection.cc
index 65126e3..b615b5f 100644
--- a/src/core/gameconnection.cc
+++ b/src/core/gameconnection.cc
@@ -31,7 +31,7 @@ GameConnection::GameConnection(std::string const &connectionstr)
size_t found = host.find(':');
if (found != std::string::npos) {
- std::istringstream str(host.substr(found+1));
+ std::istringstream str(host.substr(found + 1));
if (str >> port) {
host.erase(found, std::string::npos);
} else {
@@ -82,7 +82,7 @@ unsigned long GameConnection::timestamp() const
float GameConnection::time() const
{
- return ((float)(connection_timestamp) / 1000.0f);
+ return ((float)(connection_timestamp) / 1000.0f);
}
bool GameConnection::interactive() const
@@ -165,18 +165,18 @@ void GameConnection::frame(unsigned long timestamp)
connection_network->frame();
float f = 0;
- if (core::Cvar::net_framerate->value()) {
+ if (core::Cvar::net_framerate->value()) {
f = 1000.0f / core::Cvar::net_framerate->value();
if (connection_netframe + f > timestamp) {
return;
}
- }
+ }
connection_netframe = timestamp;
if (connection_network->state() == NetConnection::Connected) {
- if(localcontrol() && localcontrol()->dirty()) {
+ if (localcontrol() && localcontrol()->dirty()) {
connection_network->send_clientupdate(localcontrol());
localcontrol()->set_dirty(false);
@@ -184,7 +184,7 @@ void GameConnection::frame(unsigned long timestamp)
if (localplayer()->dirty()) {
connection_network->send_playerinfo();
-
+
}
}