j

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index 7420fbda9d95a4f7de4f944c202cbe370d205f34..b3d51c364653e637fba9df4ec5f44f6db53f2d34 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -25,12 +25,11 @@
 #include "player_interface.h"
 #include "player_device_walk.h"
 #include "player_device_skate.h"
+#include "player_device_dead.h"
 #include "player_model.h"
 
 /* temp */
 VG_STATIC player_interface localplayer;
-VG_STATIC struct player_device_walk localplayer_walk;
-VG_STATIC struct player_device_skate localplayer_skate;
 VG_STATIC struct player_avatar localplayer_avatar;
 VG_STATIC glmesh localplayer_meshes[3];
 
@@ -66,6 +65,14 @@ VG_STATIC void vg_launch_opt(void)
 
 }
 
+VG_STATIC int __kill( int argc, const char *argv[] )
+{
+#if 0
+   player_use_device( &localplayer, &player_device_dead, &localplayer_dead );
+#endif
+   return 0;
+}
+
 VG_STATIC int __respawn( int argc, const char *argv[] )
 {
    struct respawn_point *rp = NULL, *r;
@@ -122,6 +129,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,
@@ -152,6 +161,12 @@ VG_STATIC void vg_preload(void)
       //.poll_suggest = reset_player_poll
    });
 
+   vg_function_push( (struct vg_cmd) {
+      .name = "ded",
+      .function = __kill,
+      //.poll_suggest = reset_player_poll
+   });
+
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
 vg_info(" 2021-2022  |\\      /| |           /  |      |    | |    /| \n" );
 vg_info("            | \\    / | +--        /   +----- +---'  |   / | \n" );
@@ -234,8 +249,11 @@ VG_STATIC void vg_load(void)
    player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" );
    player_use_avatar( &localplayer, &localplayer_avatar );
    player_use_mesh( &localplayer, &localplayer_meshes[0] );
-   player_use_device( &localplayer, &player_device_walk, &localplayer_walk );
-   player_use_device( &localplayer, &player_device_skate, &localplayer_skate );
+
+   player_add_device( &localplayer, &player_device_walk );
+   player_add_device( &localplayer, &player_device_skate );
+   player_add_device( &localplayer, &player_device_dead );
+   player_bind( &localplayer );
 
    /* --------------------- */
 
@@ -311,7 +329,7 @@ VG_STATIC void vg_update_post(void)
       }
 #endif
 
-      player_post_update( &localplayer, &main_camera );
+      player_post_update( &localplayer );
 
 #if 0
       menu_update();
@@ -393,7 +411,6 @@ VG_STATIC void render_scene(void)
 
    /* Draw world */
    glEnable( GL_DEPTH_TEST );
-
    render_world( &main_camera );