-#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 "ent_skateshop.h"
-#include "workshop.h"
-
-struct{
- char name[64];
-
- enum world_load_type{
- k_world_load_type_local,
- k_world_load_type_workshop /* unimplemented */
- }
- location;
- int generate_point_cloud;
- u32 world_index;
-}
-static world_loader;
-
-static world_instance *world_loading_instance(void);
-static void world_free( world_instance *world );
-static int world_freeable( world_instance *world );
+#include "addon.h"
-#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);