Merge all features from glider feature branch

[carveJwlIkooP6JGAAIwe30JlM.git] / world_load.h

diff --git a/world_load.h b/world_load.h
index 1dc9384b316998aa4599a3753fb95a2aff18e7c1..3e4722aac36ac33294b2c3e7d6f243e8fcf4aa06 100644 (file)
--- a/world_load.h
+++ b/world_load.h
@@ -10,23 +10,8 @@
 #include "world_volumes.h"
 #include "addon.h"
 
-struct{
-   addon_reg *reg;
-   char override_name[64];
-   int generate_point_cloud;
-   u32 world_index;
-
-   enum world_loader_state{
-      k_world_loader_none,
-      k_world_loader_preload,
-      k_world_loader_load
-   }
-   state;
-}
-static world_loader;
-
-static world_instance *world_loading_instance(void);
 static void world_free( world_instance *world );
 static int world_freeable( world_instance *world );
+static int skaterift_load_world_command( int argc, const char *argv[] );
 
 #endif /* WORLD_LOAD_H */