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_route.c
diff --git
a/ent_route.c
b/ent_route.c
index 8f95a26d292ce22c76c528e1819d8394f6cb7408..11b680d6f08a00cb6419754ad2998fe676200017 100644
(file)
--- a/
ent_route.c
+++ b/
ent_route.c
@@
-10,8
+10,10
@@
void ent_route_call( world_instance *world, ent_call *call )
ent_route *route = mdl_arritm( &world->ent_route, index );
if( call->function == 0 ){ /* view() */
ent_route *route = mdl_arritm( &world->ent_route, index );
if( call->function == 0 ){ /* view() */
- if( localplayer.subsystem == k_player_subsystem_walk ){
- world_entity_focus( call->id );
+ if( localplayer.subsystem == k_player_subsystem_walk )
+ {
+ world_entity_set_focus( call->id );
+ world_entity_focus_modal();
gui_helper_clear();
vg_str text;
gui_helper_clear();
vg_str text;
@@
-61,8
+63,10
@@
void ent_route_preupdate( ent_route *route, int active )
global_ent_route.helper_alltime->greyed =!world_sfd.view_weekly;
global_ent_route.helper_weekly->greyed = world_sfd.view_weekly;
global_ent_route.helper_alltime->greyed =!world_sfd.view_weekly;
global_ent_route.helper_weekly->greyed = world_sfd.view_weekly;
- if( button_down( k_srbind_mback ) ){
- world_entity_unfocus();
+ if( button_down( k_srbind_mback ) )
+ {
+ world_entity_exit_modal();
+ world_entity_clear_focus();
gui_helper_clear();
return;
}
gui_helper_clear();
return;
}