X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=workshop.h;h=e09faf124d3de0b1467c35fa35a6f02a37e1d92b;hb=c0e4a67ba2f001179df6e2cde97370a946669c22;hp=f328d179316444e80e5b3dfaa84672bb54a23ecc;hpb=7fb47c3eb672f4468da8b5b452c09d44e1389d5f;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/workshop.h b/workshop.h
index f328d17..e09faf1 100644
--- a/workshop.h
+++ b/workshop.h
@@ -1,9 +1,8 @@
 #ifndef WORKSHOP_H
 #define WORKSHOP_H
 
-#include "workshop_types.h"
-
 #define VG_GAME
+#include "addon_types.h"
 #include "vg/vg.h"
 #include "vg/vg_steam_remote_storage.h"
 #include "skaterift.h"
@@ -34,16 +33,24 @@ struct async_workshop_metadata_info{
 #define WORKSHOP_VIEW_PER_PAGE 15
 
 struct workshop_form{
+   enum workshop_op {
+      k_workshop_op_none,
+      k_workshop_op_downloading_submission,
+      k_workshop_op_publishing_update,
+      k_workshop_op_loading_model
+   }
+   op;
+
    struct {
       char title[80];
       char description[512];
       char author[32];
-      struct ui_dropdown_value submission_type_selection;
-      enum workshop_file_type type;
+      i32 submission_type_selection;
+      enum addon_type type;
 
       PublishedFileId_t file_id; /* 0 if not published yet */
 
-      struct ui_dropdown_value visibility;
+      i32 visibility;
       int submit_title,       /* set if the respective controls are touched */
           submit_description,
           submit_file_and_image;
@@ -66,6 +73,7 @@ struct workshop_form{
 
    char addon_folder[128];
    struct player_board board_model;
+   struct player_model player_model;
 
    /* what does the user want to do with the image preview? */
    enum workshop_form_file_intent{
@@ -105,6 +113,7 @@ struct workshop_form{
     */
 
    const char *failure_or_success_string;
+   char error_msg[256];
 
    int img_w, img_h;
    u8 *img_buffer;
@@ -124,16 +133,10 @@ static workshop_form;
 
 
 
-VG_STATIC int workshop_submit_command( int argc, const char *argv[] );
-VG_STATIC void async_workshop_get_filepath( void *data, u32 len );
-VG_STATIC void async_workshop_get_installed_files( void *data, u32 len );
-VG_STATIC void workshop_load_metadata( const char *path,
+static int workshop_submit_command( int argc, const char *argv[] );
+static void async_workshop_get_filepath( void *data, u32 len );
+static void async_workshop_get_installed_files( void *data, u32 len );
+static void workshop_load_metadata( const char *path,
                                        struct workshop_file_info *info );
 
-/* generic reciever */
-VG_STATIC void workshop_async_any_complete( void *data, u32 size )
-{
-   skaterift_end_op();
-}
-
 #endif /* WORKSHOP_H */