-#ifndef WORLD_LOAD_H
-#define WORLD_LOAD_H
-
+#pragma once
#include <time.h>
#include "world.h"
-#include "world_gen.h"
-#include "world_routes.h"
-#include "world_entity.h"
-#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 );
-
-#endif /* WORLD_LOAD_H */
+void world_free( world_instance *world );
+int world_freeable( world_instance *world );
+int skaterift_load_world_command( int argc, const char *argv[] );
+void skaterift_change_world_start( addon_reg *reg );
+void skaterift_change_client_world_preupdate(void);