X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=e158e184e4b9f89193d0552842c75fde21e2082a;hb=c52e639cdcf6d21f69caa9625238afded7513ca4;hp=ecbd6e0044503063c2ebfde108076db8b95f6dd2;hpb=b528a849aba893cee8c8bfbaa01ff13cf59fb429;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index ecbd6e0..e158e18 100644 --- a/world.h +++ b/world.h @@ -21,7 +21,6 @@ VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit ); #include "shaders/terrain.h" #include "shaders/sky.h" -#include "shaders/planeinf.h" #include "shaders/standard.h" #include "shaders/vblend.h" #include "shaders/gpos.h" @@ -401,10 +400,10 @@ VG_STATIC int world_change_world( int argc, const char *argv[] ) VG_STATIC void world_init(void) { - vg_convar_push( (struct vg_convar){ + vg_var_push( (struct vg_var){ .name = "water_enable", .data = &world.water.enabled, - .data_type = k_convar_dtype_i32, + .data_type = k_var_dtype_i32, .opt_i32 = { .min=0, .max=1, .clamp=1 }, .persistent = 0 }); @@ -426,7 +425,6 @@ VG_STATIC void world_init(void) shader_terrain_register(); shader_sky_register(); - shader_planeinf_register(); shader_gpos_register(); shader_blitcolour_register(); shader_alphatest_register();