a mess but stable

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 49d1aaea690849f6fb32bfb3e645901940d9d33d..3a067db5ce24cdc4e47de1f121126096f0c47ff0 100644 (file)
--- a/world.h
+++ b/world.h
@@ -134,7 +134,7 @@ struct world_instance {
    float probabilities[3];
 
    v3i light_cubes;
-   struct framebuffer heightmap;
+   vg_framebuffer *heightmap;
 
    /*
     * Dynamically allocated when world_load is called.
@@ -157,6 +157,7 @@ struct world_instance {
       mdl_submesh sm_geo,
                   sm_no_collide;
       u32 flags;
+      u32 alpha_tex;
    }
    * surfaces;
    u32 surface_count;
@@ -214,8 +215,7 @@ struct world_instance {
    /* graphics */
    glmesh mesh_route_lines;
    glmesh mesh_geo, 
-          mesh_no_collide,
-          mesh_water;
+          mesh_no_collide;
    u32 cubemap_cooldown, cubemap_side;
 
    /* leaderboards */