X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=cdef5a41c4f5b9ba236981ecca7036b313fc7a08;hb=76315944e5a98838163e0aba8601ed3522f0724d;hp=00fb7d5656a4f31e9d0a6df390ecfaa2573a855d;hpb=237b1d672a077702267b4ceedd0479bdc62ccedc;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 00fb7d5..cdef5a4 100644 --- a/skaterift.c +++ b/skaterift.c @@ -13,6 +13,7 @@ #define SR_NETWORKED #define VG_AUDIO_FORCE_COMPRESSED +#define SDL_MAIN_HANDLED #ifndef VG_RELEASE #define VG_DEVWINDOW @@ -164,6 +165,7 @@ static void skaterift_restore_state(void){ static addon_reg *skaterift_mount_world_unloadable( const char *path, u32 ext ){ addon_reg *reg = addon_mount_local_addon( path, k_addon_type_world, ".mdl" ); + if( !reg ) vg_fatal_error( "world not found\n" ); reg->flags |= (ADDON_REG_HIDDEN | ext); return reg; } @@ -176,6 +178,7 @@ static void skaterift_load_world_content(void){ skaterift_mount_world_unloadable( "maps/mp_mtzero", ADDON_REG_MTZERO|ADDON_REG_PREMIUM ); skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 ); + skaterift_mount_world_unloadable( "maps/dev_flatworld", 0 ); world_static.load_state = k_world_loader_load; @@ -585,7 +588,9 @@ static void render_main_game(void){ } else{ player__animate(); - skaterift_record_frame( &skaterift.replay, 0 ); + skaterift_record_frame( &skaterift.replay, + localplayer.deferred_frame_record ); + localplayer.deferred_frame_record = 0; } animate_remote_players(); player__pre_render(); @@ -668,6 +673,9 @@ static void vg_render(void){ static void vg_gui(void){ if( skaterift.op == k_async_op_clientloading ) return; + vg_ui.tex_bg = gpipeline.fb_main->attachments[0].id; + render_fb_inverse_ratio( gpipeline.fb_main, vg_ui.bg_inverse_ratio ); + menu_update(); if( skaterift.activity == k_skaterift_menu ){ glClear( GL_DEPTH_BUFFER_BIT );