projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update helpers
[carveJwlIkooP6JGAAIwe30JlM.git]
/
ent_challenge.c
diff --git
a/ent_challenge.c
b/ent_challenge.c
index 10196bf635fce0ed5297ae84ef513391412ef900..b8f2f5e27ef6a083c822557455df179a44115222 100644
(file)
--- a/
ent_challenge.c
+++ b/
ent_challenge.c
@@
-27,6
+27,13
@@
static void ent_challenge_call( world_instance *world, ent_call *call ){
(world_static.challenge_target == NULL) ){
world_static.challenge_target = NULL;
world_entity_focus( call->id );
(world_static.challenge_target == NULL) ){
world_static.challenge_target = NULL;
world_entity_focus( call->id );
+
+ gui_helper_clear();
+ vg_str text;
+ if( gui_new_helper( input_button_list[k_srbind_maccept], &text ))
+ vg_strcat( &text, "start" );
+ if( gui_new_helper( input_button_list[k_srbind_mback], &text ))
+ vg_strcat( &text, "exit" );
}
}
else {
}
}
else {
@@
-68,9
+75,6
@@
static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
world_entity_focus_camera( world, challenge->camera );
world_entity_focus_camera( world, challenge->camera );
- gui_helper_action( button_display_string( k_srbind_maccept ), "start" );
- gui_helper_action( button_display_string( k_srbind_mback ), "exit" );
-
if( mdl_entity_id_type( challenge->first ) == k_ent_objective ){
if( button_down( k_srbind_maccept ) ){
u32 index = mdl_entity_id_id( challenge->first );
if( mdl_entity_id_type( challenge->first ) == k_ent_objective ){
if( button_down( k_srbind_maccept ) ){
u32 index = mdl_entity_id_id( challenge->first );
@@
-78,6
+82,7
@@
static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
index );
world_static.challenge_timer = 0.0f;
world_entity_unfocus();
index );
world_static.challenge_timer = 0.0f;
world_entity_unfocus();
+ gui_helper_clear();
u32 next = challenge->first;
while( mdl_entity_id_type(next) == k_ent_objective ){
u32 next = challenge->first;
while( mdl_entity_id_type(next) == k_ent_objective ){
@@
-95,6
+100,7
@@
static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
if( button_down( k_srbind_mback ) ){
world_static.challenge_target = NULL;
world_entity_unfocus();
if( button_down( k_srbind_mback ) ){
world_static.challenge_target = NULL;
world_entity_unfocus();
+ gui_helper_clear();
audio_oneshot( &audio_challenge[4], 1.0f, 0.0f );
return;
}
audio_oneshot( &audio_challenge[4], 1.0f, 0.0f );
return;
}