restore orientation on player load

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

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 236fa1a41fe0872a35d5a819da2f186fa764b998..fd4fbee8bad7c3b68362bb4950cebd2ecf2a3406 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -48,11 +48,12 @@ void InitialState::Render(Viewport &viewport) {
 InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 : master(master)
 , res()
+, 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))
 , hud(master.GetEnv(), master.GetConfig(), player)
-, manip(master.GetEnv(), player.GetEntity())
+, manip(master.GetEnv().audio, sounds, player.GetEntity())
 , input(world, player, master.GetClient())
 , interface(master.GetConfig(), master.GetEnv().keymap, input, *this)
 , chunk_receiver(world.Chunks(), save)
@@ -64,6 +65,11 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
                save.Write(master.GetWorldConf());
        }
        res.Load(master.GetEnv().loader, "default");
+       if (res.models.size() < 1) {
+               throw std::runtime_error("need at least one model to run");
+       }
+       res.models[0].Instantiate(player.GetEntity().GetModel());
+       sounds.Load(master.GetEnv().loader, res.snd_index);
        interface.SetInventorySlots(res.block_types.size() - 1);
        chunk_renderer.LoadTextures(master.GetEnv().loader, res.tex_index);
        chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
@@ -374,6 +380,8 @@ void MasterState::On(const Packet::Join &pack) {
        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);
 
        env.state.PopAfter(this);
        env.state.Push(state.get());