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

diff --git a/src/server/ServerState.cpp b/src/server/ServerState.cpp
index ebe675f..0bec391 100644
--- a/src/server/ServerState.cpp
+++ b/src/server/ServerState.cpp
@@ -1,7 +1,7 @@
 #include "ServerState.hpp"
 
 #include "../app/Environment.hpp"
-#include "../app/TextureIndex.hpp"
+#include "../io/WorldSave.hpp"
 #include "../net/io.hpp"
 
 #include <iostream>
@@ -15,31 +15,42 @@ ServerState::ServerState(
 	const Generator::Config &gc,
 	const World::Config &wc,
 	const WorldSave &ws,
-	const Server::Config &sc
+	const Config &config
 )
 : env(env)
-, block_types()
-, world(block_types, wc)
+, res()
+, world(res.block_types, wc)
 , generator(gc)
 , chunk_loader(world.Chunks(), generator, ws)
-, skeletons()
-, spawner(world, skeletons, gc.seed)
-, server(sc, world)
+, spawner(world, res.models, env.rng)
+, server(config.net, world, wc, ws)
 , loop_timer(16) {
-	TextureIndex tex_index;
-	env.loader.LoadBlockTypes("default", block_types, tex_index);
-	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();
 
-	std::cout << "listening on UDP port " << sc.port << std::endl;
+	std::cout << "listening on UDP port " << config.net.port << std::endl;
+}
+
+ServerState::~ServerState() {
+
 }
 
 
 void ServerState::Handle(const SDL_Event &event) {
 	if (event.type == SDL_QUIT) {
+		std::cout << "saving remaining chunks" << std::endl;
+		for (Chunk &chunk : world.Chunks()) {
+			if (chunk.ShouldUpdateSave()) {
+				chunk_loader.SaveFile().Write(chunk);
+			}
+		}
 		env.state.PopAll();
 	}
 }