diff options
author | Stijn Buys <ingar@osirion.org> | 2008-05-14 21:07:10 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-05-14 21:07:10 +0000 |
commit | a185c11f2397c0296a4b62cc266b4fa00a63c1e2 (patch) | |
tree | 186da4cdee2d9cd46fb2415567da1c441c7431ef /src/core/netconnection.cc | |
parent | 599adb817e19d9be3502e501dc904c7255cd616c (diff) |
console, camera & interpolation
Diffstat (limited to 'src/core/netconnection.cc')
-rw-r--r-- | src/core/netconnection.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/netconnection.cc b/src/core/netconnection.cc index 2bcd6dc..22614d2 100644 --- a/src/core/netconnection.cc +++ b/src/core/netconnection.cc @@ -307,9 +307,9 @@ void NetConnection::parse_incoming_message(const std::string & message) } else if (command == "ping") { } else if (command == "frame") { - float timestamp; - if (msgstream >> timestamp) { - game()->reset_clientstate(timestamp); + float timestamp, prevtimestamp; + if ((msgstream >> timestamp) && (msgstream >> prevtimestamp)) { + game()->reset_clientstate(timestamp, prevtimestamp); } } else if (command == "die") { @@ -329,16 +329,16 @@ void NetConnection::parse_incoming_message(const std::string & message) switch (type) { case Entity::Default: - new Entity(msgstream); + game()->update_entity_clientstate(new Entity(msgstream)); break; case Entity::Dynamic: - new EntityDynamic(msgstream); + game()->update_entity_clientstate(new EntityDynamic(msgstream)); break; case Entity::Controlable: - new EntityControlable(msgstream); + game()->update_entity_clientstate(new EntityControlable(msgstream)); break; case Entity::Globe: - new EntityGlobe(msgstream); + game()->update_entity_clientstate(new EntityGlobe(msgstream)); break; default: con_warn << "Create for unknown entity type " << type << std::endl; |