ignore empty chat lines

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

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 44163f6cc17b74b9cb548b3bd93242e6028b6a90..8b532633ab0cd85dc2926f2dbda72eb3ed7762e3 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -51,7 +51,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 , sounds()
 , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host))
 , world(res.block_types, master.GetWorldConf())
-, player(*world.AddPlayer(master.GetConfig().player.name))
+, player(*world.AddPlayer(master.GetConfig().player.name, player_id))
 , hud(master.GetEnv(), master.GetConfig(), player)
 , manip(master.GetEnv().audio, sounds, player.GetEntity())
 , input(world, player, master.GetClient())
@@ -171,11 +171,10 @@ void InteractiveState::Handle(const Packet::SpawnEntity &pack) {
        Entity &entity = world.ForceAddEntity(entity_id);
        UpdateEntity(entity_id, pack.Seq());
        pack.ReadEntity(entity);
-       uint32_t skel_id;
-       pack.ReadSkeletonID(skel_id);
-       if (skel_id > 0 && skel_id <= res.models.size()) {
-               Model &skel = res.models.Get(skel_id);
-               skel.Instantiate(entity.GetModel());
+       uint32_t model_id;
+       pack.ReadModelID(model_id);
+       if (model_id > 0 && model_id <= res.models.size()) {
+               res.models.Get(model_id).Instantiate(entity.GetModel());
        }
        cout << "spawned entity #" << entity_id << "  (" << entity.Name()
                << ") at " << entity.AbsolutePosition() << endl;
@@ -199,7 +198,10 @@ void InteractiveState::Handle(const Packet::EntityUpdate &pack) {
        auto world_end = world.Entities().end();
 
        uint32_t count = 0;
+       glm::ivec3 base;
        pack.ReadEntityCount(count);
+       pack.ReadChunkBase(base);
+       EntityState state;
 
        for (uint32_t i = 0; i < count; ++i) {
                uint32_t entity_id = 0;
@@ -214,7 +216,8 @@ void InteractiveState::Handle(const Packet::EntityUpdate &pack) {
                }
                if (world_iter->ID() == entity_id) {
                        if (UpdateEntity(entity_id, pack.Seq())) {
-                               pack.ReadEntityState(world_iter->GetState(), i);
+                               pack.ReadEntityState(state, base, i);
+                               world_iter->SetState(state);
                        }
                }
        }
@@ -320,7 +323,9 @@ void InteractiveState::Exit() {
 }
 
 void InteractiveState::OnLineSubmit(const string &line) {
-       master.GetClient().SendMessage(1, 0, line);
+       if (!line.empty()) {
+               master.GetClient().SendMessage(1, 0, line);
+       }
 }
 
 
@@ -398,9 +403,9 @@ void MasterState::On(const Packet::Join &pack) {
        pack.ReadPlayerID(player_id);
        state.reset(new InteractiveState(*this, player_id));
 
-       pack.ReadPlayerState(state->GetPlayer().GetEntity().GetState());
-       glm::vec3 orient(glm::eulerAngles(state->GetPlayer().GetEntity().Orientation()));
-       state->GetPlayerController().TurnHead(orient.x, orient.y);
+       EntityState player_state;
+       pack.ReadPlayerState(player_state);
+       state->GetPlayer().GetEntity().SetState(player_state);
 
        env.state.PopAfter(this);
        env.state.Push(state.get());