quite a lot of changes

[carveJwlIkooP6JGAAIwe30JlM.git] / workshop.c

diff --git a/workshop.c b/workshop.c
index 1967e7503e2b4bbc5d95257d3bf8592d569bdd01..d0a3883d1793732253b41d4e551fe94b8e4ea043 100644 (file)
--- a/workshop.c
+++ b/workshop.c
@@ -12,7 +12,6 @@
 #include "vg/vg_steam_auth.h"
 #include "vg/vg_steam_ugc.h"
 #include "vg/vg_steam_friends.h"
-#include "conf.h"
 #include "steam.h"
 #include "highscores.h"
 
@@ -24,9 +23,9 @@ static struct ui_dropdown_opt workshop_form_visibility_opts[] = {
 };
 
 static struct ui_dropdown_opt workshop_form_type_opts[] = {
- { "None",  k_workshop_file_type_none },
- { "Board", k_workshop_file_type_board },
- { "World", k_workshop_file_type_world },
+ { "None",  k_addon_type_none },
+ { "Board", k_addon_type_board },
+ { "World", k_addon_type_world },
 };
 
 /* 
@@ -60,9 +59,9 @@ VG_STATIC void workshop_reset_submission_data(void)
    workshop_form.submission.title[0] = '\0';
    workshop_form.submission.author[0] = '\0';
    workshop_form.submission.submission_type_selection.value = 
-      k_workshop_file_type_none;
+      k_addon_type_none;
    workshop_form.submission.submission_type_selection.index = 0;
-   workshop_form.submission.type = k_workshop_file_type_none;
+   workshop_form.submission.type = k_addon_type_none;
 
    workshop_form.submission.visibility.value = 
       k_ERemoteStoragePublishedFileVisibilityPublic;
@@ -189,10 +188,10 @@ VG_STATIC void workshop_form_upload_submission( PublishedFileId_t file_id,
       vg_strnull( &folder, path_buf, 4096 );
       vg_strcat( &folder, vg.base_path );
 
-      if( workshop_form.submission.type == k_workshop_file_type_board ){
+      if( workshop_form.submission.type == k_addon_type_board ){
          vg_strcat( &folder, "boards/" );
       }
-      else if( workshop_form.submission.type == k_workshop_file_type_world ){
+      else if( workshop_form.submission.type == k_addon_type_world ){
          vg_strcat( &folder, "maps/" );
       }
       vg_strcat( &folder, workshop_form.addon_folder );
@@ -303,10 +302,10 @@ VG_STATIC void _workshop_form_submit_thread( void *data )
    vg_str folder;
    vg_strnull( &folder, path_buf, 4096 );
 
-   if( workshop_form.submission.type == k_workshop_file_type_board ){
+   if( workshop_form.submission.type == k_addon_type_board ){
       vg_strcat( &folder, "boards/" );
    }
-   else if( workshop_form.submission.type == k_workshop_file_type_world ){
+   else if( workshop_form.submission.type == k_addon_type_world ){
       vg_strcat( &folder, "maps/" );
    }
    vg_strcat( &folder, workshop_form.addon_folder );
@@ -480,7 +479,7 @@ VG_STATIC void _workshop_form_load_thread( void *data )
    vg_str folder;
    vg_strnull( &folder, path_buf, 4096 );
 
-   if( workshop_form.submission.type == k_workshop_file_type_world )
+   if( workshop_form.submission.type == k_addon_type_world )
       vg_strcat( &folder, "maps/" );
    else vg_strcat( &folder, "boards/" );
 
@@ -536,7 +535,7 @@ VG_STATIC void _workshop_form_load_thread( void *data )
  */
 VG_STATIC void workshop_op_load_model(void)
 {
-   if( workshop_form.submission.type == k_workshop_file_type_world ){
+   if( workshop_form.submission.type == k_addon_type_world ){
       vg_warn( "WORLD LOAD INFO Currently unsupported\n" );
       return;
    }
@@ -690,10 +689,10 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index )
       workshop_form.file_intent = k_workshop_form_file_intent_keep_old;
       workshop_form.page = k_workshop_form_edit;
       workshop_form.submission.visibility.value = details.m_eVisibility;
-      workshop_form.submission.type = k_workshop_file_type_none;
+      workshop_form.submission.type = k_addon_type_none;
       workshop_form.submission.submission_type_selection.index = 0;
       workshop_form.submission.submission_type_selection.value = 
-         k_workshop_file_type_none;
+         k_addon_type_none;
 
       if( have_meta ){
          u32 len = strlen(metadata_str);
@@ -1062,13 +1061,13 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){
    ui_split_ratio( button_l, k_ui_axis_v, 0.5f, 2, button_l, button_r );
 
    if( workshop_form.submission.submission_type_selection.value !=
-         k_workshop_file_type_none ){
+         k_addon_type_none ){
       if( ui_button_text( button_l, "OK", 1 ) ){
-         enum workshop_file_type type = 
+         enum addon_type type = 
                workshop_form.submission.submission_type_selection.value;
          workshop_form.submission.type = type;
 
-         if( type == k_workshop_file_type_world ){
+         if( type == k_addon_type_world ){
             workshop_form.view_changed = 1;
             workshop_form.file_intent = k_workshop_form_file_intent_new;
          }
@@ -1087,14 +1086,14 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){
 }
 
 VG_STATIC void workshop_form_gui_draw_preview( ui_rect img_box ){
-   enum workshop_file_type type = workshop_form.submission.type;
+   enum addon_type type = workshop_form.submission.type;
    if( workshop_form.file_intent == k_workshop_form_file_intent_keep_old ){
       ui_image( img_box, gpipeline.fb_workshop_preview->attachments[0].id );
    }
    else if( workshop_form.file_intent == k_workshop_form_file_intent_new ){
       ui_image( img_box, gpipeline.fb_workshop_preview->attachments[0].id );
 
-      if( type == k_workshop_file_type_world ){
+      if( type == k_addon_type_world ){
          return;
       }
 
@@ -1154,9 +1153,9 @@ VG_STATIC void workshop_form_gui_draw_preview( ui_rect img_box ){
 }
 
 VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
-   enum workshop_file_type type = workshop_form.submission.type;
+   enum addon_type type = workshop_form.submission.type;
 
-   if( type == k_workshop_file_type_none ){
+   if( type == k_addon_type_none ){
       workshop_form_gui_page_undecided( content );
       return;
    }
@@ -1174,7 +1173,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
    ui_split( content, k_ui_axis_h, 8, 0, null, content );
    ui_split( content, k_ui_axis_h, 28, 0, file_entry, content );
 
-   if( workshop_form.submission.type == k_workshop_file_type_board ){
+   if( workshop_form.submission.type == k_addon_type_board ){
       ui_label( file_entry, "Addon folder: skaterift/boards/", 
                 1, 8, file_entry );
    }
@@ -1183,7 +1182,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
                 1, 8, file_entry );
    }
 
-   if( type == k_workshop_file_type_world ){
+   if( type == k_addon_type_world ){
       struct ui_textbox_callbacks callbacks = {
          .change = workshop_changed_model_path
       };
@@ -1323,7 +1322,7 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar )
       ui_text( title, "Editing", 1, k_ui_align_middle_center, 0 );
       ui_split( sidebar, k_ui_axis_h, 28, 0, title, sidebar );
 
-      if( workshop_form.submission.type != k_workshop_file_type_none ){
+      if( workshop_form.submission.type != k_addon_type_none ){
          char buf[512];
          vg_str str;
          vg_strnull( &str, buf, 512 );
@@ -1333,9 +1332,9 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar )
          else
             vg_strcat( &str, "Creating a new " );
 
-         if( workshop_form.submission.type == k_workshop_file_type_board )
+         if( workshop_form.submission.type == k_addon_type_board )
             vg_strcat( &str, "skateboard." );
-         else if( workshop_form.submission.type == k_workshop_file_type_world )
+         else if( workshop_form.submission.type == k_addon_type_world )
             vg_strcat( &str, "world." );
          else
             vg_strcat( &str, "???." );
@@ -1470,11 +1469,11 @@ VG_STATIC void workshop_form_gui(void)
        workshop_form.view_changed && 
        workshop_form.file_intent == k_workshop_form_file_intent_new )
    {
-      enum workshop_file_type type = workshop_form.submission.type;
-      if( type == k_workshop_file_type_board ){
+      enum addon_type type = workshop_form.submission.type;
+      if( type == k_addon_type_board ){
          workshop_render_board_preview();
       }
-      else if( type == k_workshop_file_type_world ){
+      else if( type == k_addon_type_world ){
          vg_success( "Renders world preview\n" );
          workshop_render_world_preview();
       }