#ifndef RESPAWN_C
#define RESPAWN_C
+#if 1
#include "respawn.h"
#include "skaterift.h"
#include "world.h"
if( skaterift.activity != k_skaterift_respawning ) return;
if( button_down( k_srbind_mback ) ){
+ gui_helper_clear();
srinput.state = k_input_state_resume;
skaterift.activity = k_skaterift_menu;
menu.page = 0xffffffff;
if( respawn_chooser.spawn ){
world_static.active_instance = respawn_chooser.world_id;
- localplayer.viewable_world =
- &world_static.instances[ respawn_chooser.world_id ];
player__spawn( respawn_chooser.spawn );
}
return;
}
- if( button_down( k_srbind_world_left ) ){
- if( respawn_chooser.world_id > 0 )
- respawn_chooser_setworld( respawn_chooser.world_id-1 );
- }
-
- if( button_down( k_srbind_world_right ) ){
- u32 next = respawn_chooser.world_id+1;
- if( next < vg_list_size(world_static.instances) )
- respawn_chooser_setworld( next );
- }
-
- if( button_down(k_srbind_home) ){
- respawn_chooser.home_select ++;
- if( respawn_chooser.home_select >= vg_list_size(respawn_homes) )
- respawn_chooser.home_select = 0;
- respawn_chooser_gohome();
- }
-
world_instance *world = &world_static.instances[ respawn_chooser.world_id ];
v3f *bbx = world->scene_geo.bbx;
f32 *pos = respawn_chooser.plane_pos;
for( u32 i=0; i<mdl_arrcount(&world->ent_challenge); i++ ){
ent_challenge *challenge = mdl_arritm( &world->ent_challenge, i );
- enum gui_icon icon = k_gui_icon_exclaim;
+ enum gui_icon icon = k_gui_icon_exclaim_2d;
if( challenge->status )
- icon = k_gui_icon_tick;
+ icon = k_gui_icon_tick_2d;
respawn_map_draw_icon( cam, icon, challenge->transform.co );
}
}
}
+ for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
+ ent_gate *gate = mdl_arritm( &world->ent_gate, i );
+ if( gate->flags & k_ent_gate_nonlocal ){
+ respawn_map_draw_icon( cam, k_gui_icon_rift, gate->co[0] );
+ }
+ }
+
for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
ent_route *route = mdl_arritm( &world->ent_route, i );
v4_copy( route->colour, colour );
v3_muls( colour, 1.6666f, colour );
gui_icon_setcolour( colour );
- respawn_map_draw_icon( cam, k_gui_icon_rift_run,
+ respawn_map_draw_icon( cam, k_gui_icon_rift_run_2d,
route->board_transform[3] );
}
}
if( gui_new_helper( input_joy_list[k_srjoystick_steer], &text ) )
vg_strcat( &text, "move" );
- if( gui_new_helper( input_button_list[k_srbind_mleft], &text ) )
- vg_strcat( &text, "world" );
-
if( gui_new_helper( input_button_list[k_srbind_maccept], &text ) )
vg_strcat( &text, "spawn" );
- if( gui_new_helper( input_button_list[k_srbind_home], &text ) )
- vg_strcat( &text, "home" );
+ if( gui_new_helper( input_button_list[k_srbind_mback], &text ) )
+ vg_strcat( &text, "exit" );
}
+#if 0
static void respawn_chooser_shader_uniforms(void){
v4f uPlayerPos, uSpawnPos;
v4_zero( uPlayerPos );
shader_scene_override_uPlayerPos( uPlayerPos );
shader_scene_override_uSpawnPos( uSpawnPos );
}
+#endif
+#endif
#endif /* RESPAWN_C */