my fucking fingers

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index 8edd117cebcad3929e2d1cf85a44a12d5210add4..fedaa3d8728b6b17dbf563784744c2d57c175e0f 100644 (file)
--- 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 );
    
    /* ----------------- */
@@ -181,6 +185,8 @@ VG_STATIC void vg_update(void)
 {
    steam_update();
 
+   skaterift_preupdate_inputs();
+
    if( skaterift_status == 1 ){
       draw_origin_axis();
       network_update();
@@ -190,7 +196,7 @@ VG_STATIC void vg_update(void)
 
       world_update( get_active_world(), localplayer.rb.co );
       audio_ambient_sprites_update( get_active_world(), localplayer.rb.co );
-      gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" );
+      //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" );
    }
 }
 
@@ -402,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;
 
@@ -470,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;
@@ -481,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