projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove sub-world concept
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_routes.c
diff --git
a/world_routes.c
b/world_routes.c
index b271faa7bffd8b142c3303d11e828d231e11883e..87b21c8572504917cb21150389426b59f900f819 100644
(file)
--- a/
world_routes.c
+++ b/
world_routes.c
@@
-126,14
+126,11
@@
static void world_routes_time_lap( world_instance *world, ent_route *route )
}
}
}
}
- addon_alias *alias = &world_static.addon_hub->alias;
- if( world_static.active_instance )
- alias = &world_static.addon_client->alias;
+ addon_alias *alias =
+ &world_static.instance_addons[ world_static.active_instance ]->alias;
- /* TODO: we should probably generate this once. and also ditch
- * sub-worlds */
char mod_uid[ ADDON_UID_MAX ];
char mod_uid[ ADDON_UID_MAX ];
- addon_alias_uid(
&world_static.addon_client->
alias, mod_uid );
+ addon_alias_uid( alias, mod_uid );
network_publish_laptime( mod_uid,
mdl_pstr( &world->meta, route->pstr_name ),
lap_time );
network_publish_laptime( mod_uid,
mdl_pstr( &world->meta, route->pstr_name ),
lap_time );
@@
-887,9
+884,7
@@
static void world_gen_routes_generate( u32 instance_id ){
vg_info( "Distributed %u points over %fkm^2!\n",
pcbuf->count, area/1e6f );
vg_info( "Distributed %u points over %fkm^2!\n",
pcbuf->count, area/1e6f );
- world_write_preview( instance_id? world_static.addon_client:
- world_static.addon_hub,
- pcbuf );
+ world_write_preview( world_static.instance_addons[ instance_id ], pcbuf );
vg_async_dispatch( call_pointcloud, async_pointcloud_sub );
}
vg_async_dispatch( call_pointcloud, async_pointcloud_sub );
}