X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=f2b4a176448c1e64b589e0093bb223bf4b4a4bb8;hb=0ba0bbe2da453f17f56a88521057e6514ae30b8f;hp=1065d4b58ab6a1095cd7d3d7f26e2cf1a5261780;hpb=f01a25e33a54c92e4d6bca0889b76f33af5e51eb;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 1065d4b..f2b4a17 100644
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -209,12 +209,13 @@ static void skateshop_server_helper_update(void){
  * VG event preupdate 
  */
 void temp_update_playermodel(void);
-void ent_skateshop_preupdate( ent_skateshop *shop, int active )
+void ent_skateshop_preupdate( ent_focus_context *ctx )
 {
-   if( !active ) return;
+   if( !ctx->active ) 
+      return;
 
-   /* input filter */
-   world_instance *world = world_current_instance();
+   world_instance *world = ctx->world;
+   ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, ctx->index );
 
    /* camera positioning */
    ent_camera *ref = mdl_arritm( &world->ent_camera, 
@@ -489,7 +490,7 @@ static void skateshop_render_boardshop( ent_skateshop *shop ){
       struct player_board_pose pose = {0};
       m4x3f mmdl;
       mdl_transform_m4x3( &xform, mmdl );
-      render_board( &skaterift.cam, world, board, mmdl, 
+      render_board( &g_render.cam, world, board, mmdl, 
                     &pose, k_board_shader_entity );
 
 fade_out:;
@@ -509,7 +510,7 @@ fade_out:;
    float scale = 0.2f,
          thickness = 0.03f;
 
-   font3d_bind( &gui.font, k_font_shader_default, 0, world, &skaterift.cam );
+   font3d_bind( &gui.font, k_font_shader_default, 0, world, &g_render.cam );
    shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
    /* Selection counter
@@ -530,10 +531,10 @@ fade_out:;
       vg_strcati32( &str, global_skateshop.selected_board_id+1 );
       vg_strcatch( &str, '/' );
       vg_strcati32( &str, valid_count );
-      font3d_simple_draw( 0, buf, &skaterift.cam, mmdl );
+      font3d_simple_draw( 0, buf, &g_render.cam, mmdl );
    }
    else{
-      font3d_simple_draw( 0, "Nothing installed", &skaterift.cam, mmdl );
+      font3d_simple_draw( 0, "Nothing installed", &g_render.cam, mmdl );
    }
 
    u16 cache_id = skateshop_selected_cache_id();
@@ -577,7 +578,7 @@ fade_out:;
    mlocal[3][2] = 0.0f;
    m4x3_mul( mtext, mlocal, mmdl );
    font3d_simple_draw( 0, global_skateshop.render.item_title, 
-                       &skaterift.cam, mmdl );
+                       &g_render.cam, mmdl );
 
    /* Author name
     * ----------------------------------------------------------------- */
@@ -589,7 +590,7 @@ fade_out:;
    mlocal[3][2] = 0.0f;
    m4x3_mul( mtext, mlocal, mmdl );
    font3d_simple_draw( 0, global_skateshop.render.item_desc, 
-                       &skaterift.cam, mmdl );
+                       &g_render.cam, mmdl );
 
    SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
 }
@@ -676,7 +677,7 @@ none:;
    m4x3f mtext,mlocal,mtextmdl;
    mdl_transform_m4x3( &mark_info->transform, mtext );
 
-   font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &skaterift.cam );
+   font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &g_render.cam );
    shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
    float scale = 0.2f, thickness = 0.015f, scale1 = 0.08f;
@@ -687,14 +688,14 @@ none:;
    mlocal[3][1] = 0.1f;
    mlocal[3][2] = 0.0f;
    m4x3_mul( mtext, mlocal, mtextmdl );
-   font3d_simple_draw( 0, buftext, &skaterift.cam, mtextmdl );
+   font3d_simple_draw( 0, buftext, &g_render.cam, mtextmdl );
 
    m3x3_setdiagonalv3( mlocal, (v3f){ scale1, scale1, thickness } );
    mlocal[3][0] = -font3d_string_width( 0, bufsubtext );
    mlocal[3][0] *= scale1*0.5f;
    mlocal[3][1] = -scale1*0.3f;
    m4x3_mul( mtext, mlocal, mtextmdl );
-   font3d_simple_draw( 0, bufsubtext, &skaterift.cam, mtextmdl );
+   font3d_simple_draw( 0, bufsubtext, &g_render.cam, mtextmdl );
 }
 
 /*
@@ -756,7 +757,7 @@ static void ent_skateshop_helpers_pickable( const char *acceptance )
    vg_str text;
 
    if( gui_new_helper( input_button_list[k_srbind_mback], &text ))
-      vg_strcat( &text, "exit" );
+      vg_strcat( &text, "Exit" );
 
    if( (global_skateshop.helper_pick = gui_new_helper(
                input_button_list[k_srbind_maccept], &text))){
@@ -765,7 +766,7 @@ static void ent_skateshop_helpers_pickable( const char *acceptance )
 
    if( (global_skateshop.helper_browse = gui_new_helper( 
                input_axis_list[k_sraxis_mbrowse_h], &text ))){
-      vg_strcat( &text, "browse" );
+      vg_strcat( &text, "Browse" );
    }
 }
 
@@ -822,15 +823,15 @@ entity_call_result ent_skateshop_call( world_instance *world, ent_call *call )
       {
          skateshop_update_viewpage();
          vg_loader_start( board_scan_thread, NULL );
-         ent_skateshop_helpers_pickable( "pick" );
+         ent_skateshop_helpers_pickable( "Pick" );
       }
       else if( shop->type == k_skateshop_type_charshop )
       {
-         ent_skateshop_helpers_pickable( "pick" );
+         ent_skateshop_helpers_pickable( "Pick" );
       }
       else if( shop->type == k_skateshop_type_worldshop )
       {
-         ent_skateshop_helpers_pickable( "open rift" );
+         ent_skateshop_helpers_pickable( "Open rift" );
          vg_loader_start( world_scan_thread, NULL );
       }
       else if( shop->type == k_skateshop_type_server )