Fix major overstep with last commit

[carveJwlIkooP6JGAAIwe30JlM.git] / player.h

diff --git a/player.h b/player.h
index fa9335cde0b1bd769f92b54b5a43edf5326b4d09..f03747a5098cf5afc8effde12f13fc0dce416a8b 100644 (file)
--- a/player.h
+++ b/player.h
@@ -177,17 +177,59 @@ static void player_restore_frame(void);
  * -----------------------------------------------------------------------------
  */
 
-static void player_register(void)                                        /* 0 */
-{
-   player_model_register();
-}
-
 static void player_init(void)                                            /* 1 */
 {
-   player_model_init();
-
+   rb_init( &player.phys.rb );
    rb_init( &player.collide_front );
    rb_init( &player.collide_back  );
+
+   vg_convar_push( (struct vg_convar){
+      .name = "walk_speed",
+      .data = &k_walkspeed,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 1
+   });
+
+   vg_convar_push( (struct vg_convar){
+      .name = "run_speed",
+      .data = &k_runspeed,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 1
+   });
+
+   vg_convar_push( (struct vg_convar){
+      .name = "walk_accel",
+      .data = &k_walk_accel,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 1
+   });
+
+   vg_convar_push( (struct vg_convar){
+      .name = "fc",
+      .data = &freecam,
+      .data_type = k_convar_dtype_i32,
+      .opt_i32 = { .min=0, .max=1, .clamp=1 },
+      .persistent = 1
+   });
+
+   vg_convar_push( (struct vg_convar){
+      .name = "fcs",
+      .data = &fc_speed,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 1
+   });
+
+       vg_function_push( (struct vg_cmd){
+               .name = "reset",
+               .function = reset_player
+       });
+
+   /* other systems */
+   vg_loader_highwater( player_model_init, player_model_free, NULL );
 }
 
 static void player_update(void)                                          /* 2 */