projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
npcs and tutorial stuff
[carveJwlIkooP6JGAAIwe30JlM.git]
/
ent_skateshop.c
diff --git
a/ent_skateshop.c
b/ent_skateshop.c
index ed222168ab59a94e2aab0df426645fa78b06e453..fd59f3eb047cf652cdca82f3e0c065ac34e34f79 100644
(file)
--- a/
ent_skateshop.c
+++ b/
ent_skateshop.c
@@
-317,7
+317,8
@@
void ent_skateshop_preupdate( ent_skateshop *shop, int active )
localplayer.board_view_slot = cache_id;
network_send_item( k_netmsg_playeritem_board );
localplayer.board_view_slot = cache_id;
network_send_item( k_netmsg_playeritem_board );
- world_entity_unfocus();
+ world_entity_exit_modal();
+ world_entity_clear_focus();
gui_helper_clear();
skaterift_autosave(1);
return;
gui_helper_clear();
skaterift_autosave(1);
return;
@@
-364,7
+365,8
@@
void ent_skateshop_preupdate( ent_skateshop *shop, int active )
if( button_down( k_srbind_maccept ) ){
network_send_item( k_netmsg_playeritem_player );
if( button_down( k_srbind_maccept ) ){
network_send_item( k_netmsg_playeritem_player );
- world_entity_unfocus();
+ world_entity_exit_modal();
+ world_entity_clear_focus();
gui_helper_clear();
}
}
gui_helper_clear();
}
}
@@
-437,11
+439,13
@@
void ent_skateshop_preupdate( ent_skateshop *shop, int active )
vg_fatal_error( "Unknown store (%u)\n", shop->type );
}
vg_fatal_error( "Unknown store (%u)\n", shop->type );
}
- if( button_down( k_srbind_mback ) ){
+ if( button_down( k_srbind_mback ) )
+ {
if( shop->type == k_skateshop_type_charshop )
network_send_item( k_netmsg_playeritem_player );
if( shop->type == k_skateshop_type_charshop )
network_send_item( k_netmsg_playeritem_player );
- world_entity_unfocus();
+ world_entity_exit_modal();
+ world_entity_clear_focus();
gui_helper_clear();
return;
}
gui_helper_clear();
return;
}
@@
-802,7
+806,8
@@
void ent_skateshop_call( world_instance *world, ent_call *call )
vg_info( "Entering skateshop\n" );
vg_info( "Entering skateshop\n" );
- world_entity_focus( call->id );
+ world_entity_set_focus( call->id );
+ world_entity_focus_modal();
gui_helper_clear();
if( shop->type == k_skateshop_type_boardshop ){
gui_helper_clear();
if( shop->type == k_skateshop_type_boardshop ){