add packet for merging player state back to client

[blank.git] / src / app / ServerState.cpp

diff --git a/src/app/ServerState.cpp b/src/app/ServerState.cpp
index 88e817d81f1a70d61f5011cead6f7e741619e034..0be565307308ce330b9a38d793b2be1a5496dc3b 100644 (file)
--- a/src/app/ServerState.cpp
+++ b/src/app/ServerState.cpp
@@ -11,17 +11,23 @@ namespace blank {
 
 ServerState::ServerState(
        HeadlessEnvironment &env,
+       const Generator::Config &gc,
        const World::Config &wc,
        const WorldSave &ws,
        const Server::Config &sc
 )
 : env(env)
 , block_types()
-, world(block_types, wc, ws)
+, world(block_types, wc)
+, generator(gc)
+, chunk_loader(world.Chunks(), generator, ws)
+, skeletons()
+, spawner(world, skeletons, gc.seed)
 , server(sc, world)
 , push_timer(16) {
        TextureIndex tex_index;
        env.loader.LoadBlockTypes("default", block_types, tex_index);
+       skeletons.LoadHeadless();
 
        push_timer.Start();
 
@@ -38,8 +44,10 @@ void ServerState::Handle(const SDL_Event &event) {
 
 void ServerState::Update(int dt) {
        push_timer.Update(dt);
-
        server.Handle();
+       spawner.Update(dt);
+       world.Update(dt);
+       chunk_loader.Update(dt);
        if (push_timer.Hit()) {
                server.Update(dt);
        }