use (and fix) new shape implementation

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

diff --git a/src/server/ServerState.cpp b/src/server/ServerState.cpp
index fc0da820e4513aeef509a032454c03497e571faa..7617b416882785003f8b198f3c3fb69fbd764002 100644 (file)
--- a/src/server/ServerState.cpp
+++ b/src/server/ServerState.cpp
@@ -19,6 +19,7 @@ ServerState::ServerState(
        const Config &config
 )
 : env(env)
+, shapes()
 , block_types()
 , world(block_types, wc)
 , generator(gc)
@@ -28,7 +29,8 @@ ServerState::ServerState(
 , server(config.net, world, wc, ws)
 , loop_timer(16) {
        TextureIndex tex_index;
-       env.loader.LoadBlockTypes("default", block_types, tex_index);
+       env.loader.LoadShapes("default", shapes);
+       env.loader.LoadBlockTypes("default", block_types, tex_index, shapes);
        generator.LoadTypes(block_types);
        skeletons.LoadHeadless();
        spawner.LimitSkeletons(1, skeletons.size());