X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.c;h=399de519620f7e2a428f92e01eeb536c9979dfdd;hb=eb5b5f5fa7d0b8767df69510b6313cb601df66b4;hp=b0888ea6e00249b4040aec7b64ea900605254c96;hpb=bf8478e3656ae729248a594a57d111f08bed41e0;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.c b/player.c
index b0888ea..399de51 100644
--- a/player.c
+++ b/player.c
@@ -164,10 +164,8 @@ void player__pass_gate( player_instance *player, ent_gate *gate )
 
    m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos );
 
-   if( gate->type == k_gate_type_nonlocel )
-      world_static.active_world = gate->target;
-
-   world_volumes.inside = 0;
+   if( gate->flags & k_ent_gate_nonlocal )
+      world_set_active_instance( gate->target );
 
    audio_lock();
    audio_oneshot( &audio_gate_pass, 1.0f, 0.0f );
@@ -227,12 +225,29 @@ PLAYER_API void player__im_gui( player_instance *player ){
    g_player_debugger[2] = 300;
    g_player_debugger[3] = 32;
 
+   player__debugtext( 2, "instance #%u", world_static.active_instance );
+
+   char buf_hub[96],
+        buf_client[96];
+   if( world_static.addon_client )
+      addon_alias_uid( &world_static.addon_client->alias, buf_client );
+   else
+      strcpy( buf_client, "none" );
+
+   if( world_static.addon_hub )
+      addon_alias_uid( &world_static.addon_hub->alias, buf_hub );
+   else
+      strcpy( buf_hub, "none" );
+
+   player__debugtext( 1, "hub uid: %s", buf_hub );
+   player__debugtext( 1, "client uid: %s", buf_client );
    player__debugtext( 2, "director" );
    player__debugtext( 1, "activity: %s", 
                      (const char *[]){ [k_skaterift_menu]      = "menu",
                                        [k_skaterift_replay]    = "replay",
-                                       [k_skaterift_skateshop] = "shop",
-                                       [k_skaterift_default]   = "default" 
+                                       [k_skaterift_ent_focus] = "ent_focus",
+                                       [k_skaterift_default]   = "default",
+                                       [k_skaterift_respawning]= "respawning",
                      } [skaterift.activity] );
    player__debugtext( 1, "time_rate: %.4f", skaterift.time_rate );
 
@@ -246,7 +261,6 @@ PLAYER_API void player__im_gui( player_instance *player ){
    skaterift_replay_debug_info();
 }
 
-VG_STATIC void global_skateshop_exit(void);
 
 PLAYER_API void player__setpos( player_instance *player, v3f pos ){
    v3_copy( pos, player->rb.co );
@@ -269,8 +283,17 @@ PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp ){
    player->immobile = 0;
    player->gate_waiting = NULL;
    world_static.last_use = 0.0;
-
-   global_skateshop_exit();
+   world_static.focused_entity = 0;
+   world_static.challenge_target = NULL;
+   world_static.challenge_timer = 0.0f;
+   world_entity_unfocus();
+
+   for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
+      world_instance *instance = &world_static.instances[i];
+      if( instance->status == k_world_status_loaded ){
+         world_routes_clear( instance );
+      }
+   }
 
    if( _player_reset[ player->subsystem ] )
       _player_reset[ player->subsystem ]( player, rp );
@@ -281,6 +304,11 @@ PLAYER_API void player__kill( player_instance *player ){
    
 }
 
+PLAYER_API void player__begin_holdout( player_instance *player ){
+   memcpy( &player->holdout_pose, &player->pose, sizeof(player->pose) );
+   player->holdout_time = 1.0f;
+}
+
 /* implementation */
 #include "player_common.c"
 #include "player_walk.c"