projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update helpers/location to 'frosted' ui
[carveJwlIkooP6JGAAIwe30JlM.git]
/
ent_skateshop.c
diff --git
a/ent_skateshop.c
b/ent_skateshop.c
index 1065d4b58ab6a1095cd7d3d7f26e2cf1a5261780..7b41857f38e71228bfbb3ff4403d33a8d5beaf6e 100644
(file)
--- 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);
* 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,
/* camera positioning */
ent_camera *ref = mdl_arritm( &world->ent_camera,
@@
-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_str text;
if( gui_new_helper( input_button_list[k_srbind_mback], &text ))
- vg_strcat( &text, "
e
xit" );
+ vg_strcat( &text, "
E
xit" );
if( (global_skateshop.helper_pick = gui_new_helper(
input_button_list[k_srbind_maccept], &text))){
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 ))){
if( (global_skateshop.helper_browse = gui_new_helper(
input_axis_list[k_sraxis_mbrowse_h], &text ))){
- vg_strcat( &text, "
b
rowse" );
+ vg_strcat( &text, "
B
rowse" );
}
}
}
}
@@
-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 );
{
skateshop_update_viewpage();
vg_loader_start( board_scan_thread, NULL );
- ent_skateshop_helpers_pickable( "
p
ick" );
+ ent_skateshop_helpers_pickable( "
P
ick" );
}
else if( shop->type == k_skateshop_type_charshop )
{
}
else if( shop->type == k_skateshop_type_charshop )
{
- ent_skateshop_helpers_pickable( "
p
ick" );
+ ent_skateshop_helpers_pickable( "
P
ick" );
}
else if( shop->type == k_skateshop_type_worldshop )
{
}
else if( shop->type == k_skateshop_type_worldshop )
{
- ent_skateshop_helpers_pickable( "
o
pen rift" );
+ ent_skateshop_helpers_pickable( "
O
pen rift" );
vg_loader_start( world_scan_thread, NULL );
}
else if( shop->type == k_skateshop_type_server )
vg_loader_start( world_scan_thread, NULL );
}
else if( shop->type == k_skateshop_type_server )