X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=fedaa3d8728b6b17dbf563784744c2d57c175e0f;hb=ac6288a8951db15eab6c681b8add8f350eb60746;hp=e8b1f4dd5e3dea85dee98e0abfe75372d50f0041;hpb=b3ca3b7a45eec11c46eb19772e10021177665adb;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index e8b1f4d..fedaa3d 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -11,6 +11,8 @@
  * =============================================================================
  */
 
+#if 1
+
 #define SR_NETWORKED
 #define VG_DEVWINDOW
 #include "common.h"
@@ -23,6 +25,7 @@
 #include "player.h"
 
 #include "entity.c"
+#include "workshop.c"
 
 VG_STATIC struct player_avatar localplayer_avatar;
 VG_STATIC struct player_model  localplayer_models[3];
@@ -130,6 +133,7 @@ VG_STATIC void vg_load(void)
 
    vg_loader_step( player_init, NULL );
    vg_loader_step( player_ragdoll_init, NULL );
+   vg_loader_step( workshop_init, NULL );
    vg_loader_step( skateshop_init, NULL );
    
    /* ----------------- */
@@ -404,8 +408,6 @@ VG_STATIC void render_main_game(void)
    main_camera.fov = vg_lerpf( localplayer.cam.fov, menu_smooth_fov,
                                menu_opacity );
 
-   main_camera.fov = vg_lerpf( main_camera.fov, 90.0f, 
-                               global_skateshop.factive );
    main_camera.nearz = 0.1f;
    main_camera.farz  = 2100.0f;
 
@@ -472,7 +474,7 @@ VG_STATIC void vg_render(void)
    gui_draw();
 }
 
-VG_STATIC void vg_ui(void)
+VG_STATIC void vg_gui(void)
 {
    if( skaterift_status == 0 ){
       return;
@@ -483,6 +485,14 @@ VG_STATIC void vg_ui(void)
 #endif
    world_instance *world = get_active_world();
    menu_crap_ui();
+
+   workshop_form_gui();
    
    render_view_framebuffer_ui();
 }
+
+#else
+
+#include "skaterift_imgui_dev.c"
+
+#endif