build system revision

[carveJwlIkooP6JGAAIwe30JlM.git] / workshop.c

diff --git a/workshop.c b/workshop.c
index 1b3015f58648c821781d0d4f98e3c8b97bdda801..469eeea2260d40bca903f93cb0e1990187c6fc28 100644 (file)
--- a/workshop.c
+++ b/workshop.c
@@ -1,13 +1,9 @@
-#ifndef WORKSHOP_C
-#define WORKSHOP_C
-
 #include "workshop.h"
 
-#define VG_GAME
-#include "vg/vg.h"
 #include "vg/vg_tex.h"
 #include "vg/vg_msg.h"
 #include "vg/vg_binstr.h"
+#include "vg/vg_loader.h"
 #include "ent_skateshop.h"
 
 #include "vg/vg_steam_auth.h"
@@ -322,7 +318,8 @@ static void _workshop_form_submit_thread( void *data )
    vg_msg_frame( &descriptor, "workshop" );
       vg_msg_wkvstr( &descriptor, "title", workshop_form.submission.title );
       //vg_msg_wkvstr( &descriptor, "author", "unknown" );
-      vg_msg_wkvu32( &descriptor, "type", workshop_form.submission.type );
+      vg_msg_wkvnum( &descriptor, "type", k_vg_msg_u32, 1,
+                     &workshop_form.submission.type );
       vg_msg_wkvstr( &descriptor, "folder", workshop_form.addon_folder );
    vg_msg_end_frame( &descriptor );
    //vg_msg_wkvstr( &descriptor, "location", "USA" );
@@ -680,7 +677,8 @@ static void workshop_op_download_and_view_submission( int result_index )
          vg_msg_init( &msg, metadata_buf, len/2 );
          
          if( vg_msg_seekframe( &msg, "workshop" )){
-            u32 type = vg_msg_getkvu32( &msg, "type", 0 );
+            u32 type;
+            vg_msg_getkvintg( &msg, "type", k_vg_msg_u32, &type );
             workshop_form.submission.type = type;
             workshop_form.submission.submission_type_selection = type;
 
@@ -999,7 +997,7 @@ static void workshop_render_board_preview(void){
    glBufferSubData( GL_UNIFORM_BUFFER, 0, 
                     sizeof(struct ub_world_lighting), &world->ub_lighting );
 
-   render_world( world, &cam, 0, 0, 1, 1 );
+   render_world( world, &cam, 0, 0, 0, 0 );
    struct player_board_pose pose = {0};
    render_board( &cam, world, board, mmdl,  &pose, k_board_shader_entity );
    render_board( &cam, world, board, mmdl1, &pose, k_board_shader_entity );
@@ -1539,5 +1537,3 @@ static void async_workshop_get_installed_files( void *data, u32 len )
 
    *info->len = j;
 }
-
-#endif /* WORKSHOP_C */