X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=9c87549a3e27094c1ad8ffc8cc47b3143c550b53;hb=c6ca9d21e45af5ea7caeec722a9b59fdf3aa3b24;hp=49ea4007d6a63524c392ad9953fc67812ef0dfb0;hpb=37e056bafe9603981d6bcb205e1472e063c94700;p=blank.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 49ea400..9c87549 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -38,13 +38,19 @@ void InitialState::Render(Viewport &viewport) {
 }
 
 
-InteractiveState::InteractiveState(MasterState &master)
+// TODO: this clutter is a giant mess
+InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 : master(master)
 , block_types()
 , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetClientConf().host))
 , world(block_types, master.GetWorldConf(), save)
 , chunk_renderer(world, master.GetWorldConf().load.load_dist)
-, interface(master.GetInterfaceConf(), master.GetEnv(), world) {
+, interface(
+	master.GetInterfaceConf(),
+	master.GetEnv(),
+	world,
+	*world.AddPlayer(master.GetInterfaceConf().player_name, player_id)
+) {
 	TextureIndex tex_index;
 	master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index);
 	chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
@@ -93,6 +99,8 @@ void InteractiveState::Update(int dt) {
 	chunk_renderer.Rebase(interface.Player().ChunkCoords());
 	chunk_renderer.Update(dt);
 
+	master.GetClient().SendPlayerUpdate(interface.Player());
+
 	glm::mat4 trans = interface.Player().Transform(interface.Player().ChunkCoords());
 	glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f));
 	glm::vec3 up(trans * glm::vec4(0.0f, 1.0f, 0.0f, 0.0f));
@@ -175,7 +183,10 @@ void MasterState::On(const Packet::Join &pack) {
 		// joining game
 		std::cout << "joined game" << std::endl;
 	}
-	state.reset(new InteractiveState(*this));
+
+	uint32_t player_id;
+	pack.ReadPlayerID(player_id);
+	state.reset(new InteractiveState(*this, player_id));
 
 	pack.ReadPlayer(state->GetInterface().Player());