grouped entity physics state into a struct

[blank.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 757bc3a265ab6cfd883a9f9fbdfc45020c73ae80..8a3d1c89c98e36a17c645852172f3d92d9cfb0eb 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -55,7 +55,8 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
        world.AddPlayer(master.GetInterfaceConf().player_name, player_id)
 )
 , chunk_renderer(*interface.GetPlayer().chunks)
-, skeletons() {
+, skeletons()
+, update_timer(16) {
        TextureIndex tex_index;
        master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index);
        chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
@@ -63,6 +64,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
        skeletons.Load();
        // TODO: better solution for initializing HUD
        interface.SelectNext();
+       update_timer.Start();
 }
 
 void InteractiveState::OnEnter() {
@@ -104,9 +106,13 @@ void InteractiveState::Update(int dt) {
        world.Update(dt);
        chunk_renderer.Update(dt);
 
+       update_timer.Update(dt);
+
        Entity &player = *interface.GetPlayer().entity;
 
-       master.GetClient().SendPlayerUpdate(player);
+       if (update_timer.Hit()) {
+               master.GetClient().SendPlayerUpdate(player);
+       }
 
        glm::mat4 trans = player.Transform(player.ChunkCoords());
        glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f));
@@ -206,7 +212,7 @@ void MasterState::On(const Packet::Join &pack) {
        pack.ReadPlayerID(player_id);
        state.reset(new InteractiveState(*this, player_id));
 
-       pack.ReadPlayer(*state->GetInterface().GetPlayer().entity);
+       pack.ReadPlayerState(state->GetInterface().GetPlayer().entity->GetState());
 
        env.state.PopAfter(this);
        env.state.Push(state.get());
@@ -287,7 +293,7 @@ void MasterState::On(const Packet::EntityUpdate &pack) {
                }
                if (world_iter->ID() == entity_id) {
                        if (UpdateEntity(entity_id, pack.Seq())) {
-                               pack.ReadEntity(*world_iter, i);
+                               pack.ReadEntityState(world_iter->GetState(), i);
                        }
                }
        }