X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;fp=skaterift.c;h=fee0039dc2c05dcea491e3c64f261f87521f058c;hb=a109f126d8adab622e38fbcc2d4281e75255246a;hp=eec32d5b1725b38c96bf8423fb73c765f1bb4b1d;hpb=f965094faed4f1828c7a6a6b3ca856bd5f1e5248;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index eec32d5..fee0039 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -11,15 +11,8 @@
  * =============================================================================
  */
 
-#define SR_NETWORKED
-#define VG_AUDIO_FORCE_COMPRESSED
-#define SDL_MAIN_HANDLED
 #define SR_ALLOW_REWIND_HUB
 
-#ifndef VG_RELEASE
- #define VG_DEVWINDOW
-#endif
-
 /* 
  *     system headers
  * --------------------- */
@@ -28,6 +21,7 @@
 #include "steam.h"
 #include "render.h"
 #include "audio.h"
+#include "vg/vg_opt.h"
 
 #include "world.h"
 
@@ -71,7 +65,8 @@ int main( int argc, char *argv[] ){
    return 0;
 }
 
-static void vg_launch_opt(void){
+void vg_launch_opt(void)
+{
    const char *arg;
    if( vg_long_opt( "noauth" ) ){
       network_client.auth_mode = eServerModeNoAuthentication;
@@ -95,7 +90,8 @@ static void vg_launch_opt(void){
    }
 }
 
-static void vg_preload(void){
+void vg_preload(void)
+{
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
 vg_info(" 2021-2023  |\\      /| |           /  |      |    | |    /| \n" );
 vg_info("            | \\    / | +--        /   +----- +---'  |   / | \n" );
@@ -135,7 +131,10 @@ static void skaterift_restore_state(void){
 
    vg_msg kvsav;
    vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) );
-   skaterift.achievements |= vg_msg_getkvu32( &kvsav, "ach", 0 );
+
+   u32 ach;
+   vg_msg_getkvintg( &kvsav, "ach", k_vg_msg_u32, &ach );
+   skaterift.achievements |= ach;
 
    u32 board_reg_id = 0,
        player_reg_id = 0;
@@ -207,12 +206,15 @@ static void skaterift_load_player_content(void){
    player_board_load( &localplayer.fallback_board, "models/board_none.mdl" );
 }
 
-static void vg_load(void){
+void vg_load(void)
+{
    if( k_tools_mode ){
       vg_async_call( async_call_ready, NULL, 0 );
       return;
    }
 
+   vg_audio.always_keep_compressed = 1;
+
    vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL );
    vg_console_reg_cmd( "switch_active_instance", 
                         skaterift_switch_instance_cmd, NULL );
@@ -288,7 +290,8 @@ static void skaterift_change_client_world_preupdate(void);
  * UPDATE LOOP
  * ---------------------------------------------------------------------------*/
 
-static void vg_pre_update(void){
+void vg_pre_update(void)
+{
    skaterift_preupdate_inputs();
 
    if( k_tools_mode ) return;
@@ -325,7 +328,8 @@ static void vg_pre_update(void){
    world_map_pre_update();
 }
 
-static void vg_fixed_update(void){
+void vg_fixed_update(void)
+{
    if( k_tools_mode ) return;
    if( skaterift.op == k_async_op_clientloading ) return;
 
@@ -335,7 +339,8 @@ static void vg_fixed_update(void){
    testing_update();
 }
 
-static void vg_post_update(void){
+void vg_post_update(void)
+{
    if( k_tools_mode ) return;
    if( skaterift.op == k_async_op_clientloading ) return;
 
@@ -375,7 +380,7 @@ static void vg_post_update(void){
  * RENDERING
  * ---------------------------------------------------------------------------*/
 
-static void vg_framebuffer_resize( int w, int h ){
+void vg_framebuffer_resize( int w, int h ){
    render_fb_resize();
 }
 
@@ -652,7 +657,8 @@ static void render_main_game(void){
    skaterift_replay_post_render();
 }
 
-static void vg_render(void){
+void vg_render(void)
+{
    if( k_tools_mode ){
       glBindFramebuffer( GL_FRAMEBUFFER, 0 );
       glViewport( 0,0, vg.window_x, vg.window_y );
@@ -662,7 +668,7 @@ static void vg_render(void){
    }
 
    if( skaterift.op == k_async_op_clientloading ){
-      _vg_loader_render();
+      vg_loader_render();
       return;
    }
 
@@ -686,7 +692,8 @@ static void vg_render(void){
    gui_draw();
 }
 
-static void vg_gui(void){
+void vg_gui(void)
+{
    if( skaterift.op == k_async_op_clientloading ) return;
 
    if( k_tools_mode ){
@@ -701,17 +708,6 @@ static void vg_gui(void){
 
       ui_rect_pad( panel, (ui_px[2]){ 8, 8 } );
 
-      static i32 example;
-      ui_enum( panel, "example enum", vg_settings_vsync_enum, 3, &example );
-
-      static f32 val = 30.0f;
-      ui_slider( panel, "Slider", 0.0f, 100.0f, &val, NULL );
-
-      ui_dev_colourview();
-
-      static v4f colour = { 0.5f, 0.6f, 0.1f, 1.0f };
-      ui_colourpicker( panel, "hello", colour );
-
       return;
    }