#include "respawn.c"
#include "network.c"
#include "player_remote.c"
+#include "vg/vg_audio_dsp.h"
static struct player_avatar localplayer_avatar;
}
static void vg_launch_opt(void){
+ const char *arg;
if( vg_long_opt( "noauth" ) ){
network_client.auth_mode = eServerModeNoAuthentication;
}
+
+ if( (arg = vg_long_opt_arg( "server" )) ){
+ vg_strncpy( arg, network_client.server_adress, 64,
+ k_strncpy_overflow_fatal );
+ }
}
static void vg_preload(void){
steam_init();
vg_loader_step( NULL, steam_end );
+ vg_loader_step( remote_players_init, NULL );
vg_loader_step( network_init, network_end );
}
strcpy( sav.path, str_skaterift_main_save );
savedata_file_read( &sav );
- vg_msg kvsav = {0};
- kvsav.buf = sav.buf;
- kvsav.len = sav.len;
- kvsav.max = sizeof(sav.buf);
+ vg_msg kvsav;
+ vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) );
u32 board_reg_id = 0,
player_reg_id = 0;
- vg_msg player = kvsav;
- if( vg_msg_seekframe( &player, "player", 0 ) ){
+ vg_msg_cursor orig = kvsav.cur;
+
+ if( vg_msg_seekframe( &kvsav, "player" ) ){
addon_alias q;
/* board */
- skaterift_read_addon_alias( &player, "board", k_addon_type_board, &q );
+ skaterift_read_addon_alias( &kvsav, "board", k_addon_type_board, &q );
u32 reg_id = addon_match( &q );
if( reg_id != 0xffffffff )
board_reg_id = reg_id;
-
/* playermodel */
- skaterift_read_addon_alias( &player, "playermodel",
+ skaterift_read_addon_alias( &kvsav, "playermodel",
k_addon_type_player, &q );
reg_id = addon_match( &q );
if( reg_id != 0xffffffff )
localplayer.playermodel_view_slot =
addon_cache_create_viewer( k_addon_type_player, player_reg_id );
- vg_msg world = kvsav;
- if( vg_msg_seekframe( &world, "world", 0 ) ){
+ kvsav.cur = orig;
+ if( vg_msg_seekframe( &kvsav, "world" ) ){
addon_alias q;
/* world */
- skaterift_read_addon_alias( &world, "alias", k_addon_type_world, &q );
+ skaterift_read_addon_alias( &kvsav, "alias", k_addon_type_world, &q );
u32 reg_id = addon_match( &q );
if( reg_id != 0xffffffff ){
addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
};
skaterift_world_load_thread( &args );
- world_set_active_instance( vg_msg_seekkvu32( &world, "index", 0 ) );
+ world_set_active_instance( vg_msg_getkvu32( &kvsav, "index", 0 ) );
world_static.active_trigger_volume_count = 0;
localplayer.viewable_world = world_current_instance();
}
- vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
v3f pos;
- vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
+ vg_msg_getkvv3f( &kvsav, "position", pos, (v3f){0.0f,0.0f,0.0f} );
if( v3_length2(pos) > 1.0f )
player__setpos( pos );
/* FIXME FIXME FIXME FIXME FIXME */
u32 mtx_size = sizeof(m4x3f)*localplayer_avatar.sk.bone_count;
localplayer.final_mtx = vg_linear_alloc( vg_mem.rtmemory, mtx_size );
- netplayers.final_mtx = vg_linear_alloc( vg_mem.rtmemory, mtx_size*32 );
+ netplayers.final_mtx = vg_linear_alloc( vg_mem.rtmemory,
+ mtx_size*NETWORK_MAX_PLAYERS );
player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
player__bind();
k_addon_type_world,
".mdl" );
{
- vg_msg msg = {0};
- msg.buf = spawn->metadata;
- msg.max = sizeof(spawn->metadata);
+ vg_msg msg;
+ vg_msg_init( &msg, spawn->metadata, sizeof(spawn->metadata) );
vg_msg_frame( &msg, "workshop" );
vg_msg_wkvstr( &msg, "title", "Understate DIY" );
vg_msg_end_frame( &msg );
vg_msg_wkvstr( &msg, "location", "USA" );
- spawn->metadata_len = msg.cur;
+ spawn->metadata_len = msg.cur.co;
}
/* mtzero island */
k_addon_type_world,
".mdl" );
{
- vg_msg msg = {0};
- msg.buf = mtzero->metadata;
- msg.max = sizeof(mtzero->metadata);
+ vg_msg msg;
+ vg_msg_init( &msg, spawn->metadata, sizeof(mtzero->metadata) );
vg_msg_frame( &msg, "workshop" );
vg_msg_wkvstr( &msg, "title", "Mt.Zero Island" );
vg_msg_end_frame( &msg );
vg_msg_wkvstr( &msg, "location", "Australia" );
- mtzero->metadata_len = msg.cur;
+ mtzero->metadata_len = msg.cur.co;
}
/* load home/permanent world manually */
skaterift_restore_state();
vg_loader_step( NULL, skaterift_autosave_synchronous );
- board_processview_thread(NULL);
+ //board_processview_thread(NULL);
vg_async_call( async_call_ready, NULL, 0 );
}
skaterift_change_client_world_preupdate();
draw_origin_axis();
+ skateshop_autostart_loading();
network_update();
/* time rate */
player__pre_update();
world_entity_focus_preupdate();
skaterift_replay_pre_update();
+ remote_sfx_pre_update();
world_update( world_current_instance(), localplayer.rb.co );
audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
/* Draw player to window buffer and blend background ontop */
player__render( &small_cam );
+ render_remote_players_tags( localplayer.viewable_world, &skaterift.cam );
}
static void render_scene(void){
GL_COLOR_ATTACHMENT1 } );
view_world = &world_static.instances[respawn_chooser.world_id];
render_world_override( view_world );
+ render_world_routes( view_world, &skaterift.cam, 1 );
}
else{
render_world( view_world, &skaterift.cam, 0 );
/* --------------------------------------------------------------------- */
world_instance *view_world = localplayer.viewable_world;
- if( view_world != NULL ){
+ if( (view_world != NULL) && (skaterift.activity != k_skaterift_respawning) ){
render_world_cubemaps( view_world );
ent_gate *gate = view_world->rendering_gate;