X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServerState.cpp;h=0bec3918c0345bc0e3e836157d3d148ba0ddcac2;hb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;hp=23740be1b963e612253fe1e05e4942ffeb32421d;hpb=3a487f44c26f9bb9d1a1c831406b6497b2b3b425;p=blank.git

diff --git a/src/server/ServerState.cpp b/src/server/ServerState.cpp
index 23740be..0bec391 100644
--- a/src/server/ServerState.cpp
+++ b/src/server/ServerState.cpp
@@ -1,7 +1,6 @@
 #include "ServerState.hpp"
 
 #include "../app/Environment.hpp"
-#include "../app/TextureIndex.hpp"
 #include "../io/WorldSave.hpp"
 #include "../net/io.hpp"
 
@@ -19,22 +18,20 @@ ServerState::ServerState(
 	const Config &config
 )
 : env(env)
-, shapes()
-, block_types()
-, world(block_types, wc)
+, res()
+, world(res.block_types, wc)
 , generator(gc)
 , chunk_loader(world.Chunks(), generator, ws)
-, skeletons()
-, spawner(world, skeletons, env.rng)
+, spawner(world, res.models, env.rng)
 , server(config.net, world, wc, ws)
 , loop_timer(16) {
-	TextureIndex tex_index;
-	env.loader.LoadShapes("default", shapes);
-	env.loader.LoadBlockTypes("default", block_types, tex_index);
-	generator.LoadTypes(block_types);
-	skeletons.LoadHeadless();
-	spawner.LimitSkeletons(1, skeletons.size());
-	server.SetPlayerModel(skeletons[0]);
+	res.Load(env.loader, "default");
+	if (res.models.size() < 2) {
+		throw std::runtime_error("need at least two models to run");
+	}
+	generator.LoadTypes(res.block_types);
+	spawner.LimitModels(1, res.models.size());
+	server.SetPlayerModel(res.models[0]);
 
 	loop_timer.Start();