projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move location of main camera to g_render
[carveJwlIkooP6JGAAIwe30JlM.git]
/
ent_route.c
diff --git
a/ent_route.c
b/ent_route.c
index 026bf7048ac01237a55526ebceb827f53a99c155..8564eed3c5c8c60400c2eb69e5a71b7ad599e1b1 100644
(file)
--- a/
ent_route.c
+++ b/
ent_route.c
@@
-21,14
+21,14
@@
entity_call_result ent_route_call( world_instance *world, ent_call *call )
if( (global_ent_route.helper_weekly =
gui_new_helper( input_button_list[k_srbind_mleft], &text )))
if( (global_ent_route.helper_weekly =
gui_new_helper( input_button_list[k_srbind_mleft], &text )))
- vg_strcat( &text, "
w
eekly" );
+ vg_strcat( &text, "
W
eekly" );
if( (global_ent_route.helper_alltime =
gui_new_helper( input_button_list[k_srbind_mright], &text )))
if( (global_ent_route.helper_alltime =
gui_new_helper( input_button_list[k_srbind_mright], &text )))
- vg_strcat( &text, "
a
ll time" );
+ vg_strcat( &text, "
A
ll time" );
if( gui_new_helper( input_button_list[k_srbind_mback], &text ) )
if( gui_new_helper( input_button_list[k_srbind_mback], &text ) )
- vg_strcat( &text, "
e
xit" );
+ vg_strcat( &text, "
E
xit" );
}
return k_entity_call_result_OK;
}
return k_entity_call_result_OK;
@@
-37,12
+37,14
@@
entity_call_result ent_route_call( world_instance *world, ent_call *call )
return k_entity_call_result_unhandled;
}
return k_entity_call_result_unhandled;
}
-/* TODO: these should recieve the world instance */
-void ent_route_preupdate( ent_route *route, int active )
+void ent_route_preupdate( ent_focus_context *ctx )
{
{
- if( !active ) return;
+ if( !ctx->active )
+ return;
+
+ world_instance *world = ctx->world;
+ ent_route *route = mdl_arritm( &world->ent_route, ctx->index );
- world_instance *world = world_current_instance();
u32 cam_id = 0;
if( __builtin_expect( world->meta.info.version >= 103, 1 ) )
u32 cam_id = 0;
if( __builtin_expect( world->meta.info.version >= 103, 1 ) )