X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServerState.cpp;h=3e2869fc56b1da8afec9c2faccaf71c9eed97593;hb=4e3afb4c7631591b80cb7740a9b6f46da69b7ae4;hp=8c3f7e6196f92c5272cda3b61aa9128b825891c9;hpb=75ebb9101c7aec9c16ef418b822c39e81889f66f;p=blank.git

diff --git a/src/server/ServerState.cpp b/src/server/ServerState.cpp
index 8c3f7e6..3e2869f 100644
--- a/src/server/ServerState.cpp
+++ b/src/server/ServerState.cpp
@@ -2,6 +2,7 @@
 
 #include "../app/Environment.hpp"
 #include "../app/TextureIndex.hpp"
+#include "../io/WorldSave.hpp"
 #include "../net/io.hpp"
 
 #include <iostream>
@@ -18,21 +19,25 @@ ServerState::ServerState(
 	const Config &config
 )
 : env(env)
+, shapes()
 , block_types()
+, models()
 , world(block_types, wc)
-, spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
-, generator(gc, block_types)
+, generator(gc)
 , chunk_loader(world.Chunks(), generator, ws)
-, skeletons()
-, spawner(world, skeletons, gc.seed)
-, server(config.net, world, ws)
+, spawner(world, models, env.rng)
+, server(config.net, world, wc, ws)
 , loop_timer(16) {
 	TextureIndex tex_index;
-	env.loader.LoadBlockTypes("default", block_types, tex_index);
-	generator.Scan();
-	skeletons.LoadHeadless();
-	spawner.LimitSkeletons(1, skeletons.Size());
-	server.SetPlayerModel(skeletons[0]);
+	env.loader.LoadShapes("default", shapes);
+	env.loader.LoadBlockTypes("default", block_types, tex_index, shapes);
+	env.loader.LoadModels("default", models, tex_index, shapes);
+	if (models.size() < 2) {
+		throw std::runtime_error("need at least two models to run");
+	}
+	generator.LoadTypes(block_types);
+	spawner.LimitModels(1, models.size());
+	server.SetPlayerModel(models[0]);
 
 	loop_timer.Start();
 
@@ -40,12 +45,18 @@ ServerState::ServerState(
 }
 
 ServerState::~ServerState() {
-	world.Chunks().UnregisterIndex(spawn_index);
+
 }
 
 
 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();
 	}
 }