X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=skaterift.c;h=b0324cc7facb93a1fcc64f15f8d40d143ddeba7e;hb=e61356f70eddb79f05d7b9e329e91963ec74f817;hp=9e162b2c322af6695a7857e08275c1c726910744;hpb=56f320d8ce6e8997370ec8e02fe50ca2d07b67f0;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 9e162b2..b0324cc 100644 --- a/skaterift.c +++ b/skaterift.c @@ -264,6 +264,11 @@ VG_STATIC void vg_load(void) /* load home world */ world_load( &world_global.worlds[0], "maps/mp_home.mdl" ); + world_load( &world_global.worlds[1], "maps/mp_gridmap.mdl" ); + world_load( &world_global.worlds[2], "maps/mp_mtzero.mdl" ); + world_link_nonlocal_gates( 0, 1 ); + world_link_nonlocal_gates( 0, 2 ); + vg_console_load_autos(); } @@ -411,8 +416,8 @@ VG_STATIC void render_scene(void) /* Draw world */ glEnable( GL_DEPTH_TEST ); - world_instance *world = get_active_world(); - render_world( world, &main_camera ); + world_instance *view_world = localplayer.viewable_world; + render_world( view_world, &main_camera ); int player_transparent = 1, player_draw = 1; @@ -427,10 +432,10 @@ VG_STATIC void render_scene(void) player__render( &main_camera, &localplayer ); - render_water_texture( world, &main_camera ); + render_water_texture( view_world, &main_camera ); render_fb_bind( gpipeline.fb_main ); - render_water_surface( world, &main_camera ); - render_world_gates( world, &main_camera ); + render_water_surface( view_world, &main_camera ); + render_world_gates( view_world, &main_camera ); if( player_transparent && player_draw ) render_player_transparent();