X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=6a2dd32993b1fb45031ef9485428ce256ae0f4a7;hb=bc2806164f55b7ac48dbb6d224b7d4b55683decf;hp=7e8c04ebd9c325dea92b557d64e8b85a0859870d;hpb=eba29c8ad489194cd1e3cd64b5f23424ad4384ef;p=blank.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 7e8c04e..6a2dd32 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -48,6 +48,7 @@ void InitialState::Render(Viewport &viewport) {
 // TODO: this clutter is a giant mess
 InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 : master(master)
+, shapes()
 , block_types()
 , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host))
 , world(block_types, master.GetWorldConf())
@@ -65,11 +66,12 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 		save.Write(master.GetWorldConf());
 	}
 	TextureIndex tex_index;
-	master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index);
+	master.GetEnv().loader.LoadShapes("default", shapes);
+	master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index, shapes);
+	skeletons.Load(shapes, tex_index);
 	interface.SetInventorySlots(block_types.size() - 1);
 	chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
 	chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
-	skeletons.Load();
 	loop_timer.Start();
 	if (save.Exists(player)) {
 		save.Read(player);