X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=df5c1479f8fd01ea8729570474f71d2c7834567b;hb=f99902f513b0ad606437bf32de47405dd4ea5f98;hp=7b1d1d15dbcc723067562329187f0bff4676e56f;hpb=01e2535f8daaab0e3d46dcc61a08a9268babd47c;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 7b1d1d1..df5c147 100644 --- a/skaterift.c +++ b/skaterift.c @@ -20,9 +20,8 @@ #include "audio.h" #include "world.h" #include "font.h" - - #include "player.h" + static player_instance localplayer; VG_STATIC struct player_avatar localplayer_avatar; VG_STATIC glmesh localplayer_meshes[3]; @@ -37,9 +36,6 @@ player_instance *tmp_localplayer(void) #include "menu.h" #include "vehicle.h" -static int cl_ui = 1, - cl_light_edit = 0; - #define DEV_AARON #ifdef DEV_AARON static rb_object aaron={ @@ -123,35 +119,8 @@ VG_STATIC void vg_preload(void) { g_conf_init(); - common_var_temp(); - - vg_var_push( (struct vg_var){ - .name = "cl_ui", - .data = &cl_ui, - .data_type = k_var_dtype_i32, - .opt_i32 = { .min=0, .max=1, .clamp=1 }, - .persistent = 0 - }); - - vg_var_push( (struct vg_var){ - .name = "ledit", - .data = &cl_light_edit, - .data_type = k_var_dtype_i32, - .opt_i32 = { .min=0, .max=1, .clamp=1 }, - .persistent = 0 - }); - - vg_function_push( (struct vg_cmd) { - .name = "respawn", - .function = __respawn, - //.poll_suggest = reset_player_poll - }); - - vg_function_push( (struct vg_cmd) { - .name = "ded", - .function = __kill, - //.poll_suggest = reset_player_poll - }); + vg_console_reg_cmd( "respawn", __respawn, NULL ); + vg_console_reg_cmd( "ded", __kill, NULL ); vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2022 |\\ /| | / | | | | /| \n" ); @@ -233,14 +202,13 @@ VG_STATIC void vg_load(void) vg_loader_step( render_init, NULL ); vg_loader_step( menu_init, NULL ); vg_loader_step( world_init, NULL ); + vg_loader_step( vehicle_init, NULL ); vg_loader_step( font3d_init, NULL ); font3d_load( &world_global.font, "models/rs_font.mdl", vg_mem.rtmemory ); - //vg_loader_step( player_init, NULL ); - vg_loader_step( vehicle_init, NULL ); - // - //vg_loader_step( player_model_init, NULL ); + vg_loader_step( player_init, NULL ); + vg_loader_step( player_ragdoll_init, NULL ); /* ----------------- */ vg_loader_step( load_playermodels, NULL ); @@ -522,6 +490,7 @@ VG_STATIC void render_scene(void) return; } + world_prerender( view_world ); render_world( view_world, &main_camera, 0 ); render_water_texture( view_world, &main_camera, 0 );