my fucking fingers

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index c29d8764e73076e6cafdd7ad59b897a807b275b1..fedaa3d8728b6b17dbf563784744c2d57c175e0f 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -11,9 +11,7 @@
  * =============================================================================
  */
 
-#include "skaterift_imgui_dev.c"
-
-#if 0
+#if 1
 
 #define SR_NETWORKED
 #define VG_DEVWINDOW
@@ -27,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];
@@ -134,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 );
    
    /* ----------------- */
@@ -408,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;
 
@@ -487,8 +485,14 @@ VG_STATIC void vg_gui(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