a couple fixmes related to allocations

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 622837d778728f42a6c1eb95a6aa2b59ecd9336d..c7485d17b4bf9fe7622811fdef8be3a8afa9be1a 100644 (file)
--- a/world.h
+++ b/world.h
@@ -60,6 +60,7 @@ struct world_instance {
     * -------------------------------------------------------
     */
 
+   void *heap;
    char  world_name[ 64 ];
 
    struct{
@@ -184,12 +185,12 @@ struct world_instance {
    rb_object rb_geo;
 };
 
-VG_STATIC struct world_global{
+struct world_global{
    /*
     * Allocated as system memory
     * --------------------------------------------------------------------------
     */
-   void *generic_heap;
+   void *heap;
 
    /* rendering */
    glmesh skydome;
@@ -250,9 +251,8 @@ VG_STATIC struct world_global{
    }
    text_particles[6*4];
    u32 text_particle_count;
-
 }
-world_global;
+static world_global;
 
 VG_STATIC world_instance *get_active_world( void )
 {
@@ -399,9 +399,8 @@ VG_STATIC void world_init(void)
 
    /* Allocate dynamic world memory arena */
    u32 max_size = 76*1024*1024;
-   world_global.generic_heap = vg_create_linear_allocator( vg_mem.rtmemory, 
-                                                           max_size,
-                                                           VG_MEMORY_SYSTEM );
+   world_global.heap = vg_create_linear_allocator( vg_mem.rtmemory, max_size,
+                                                   VG_MEMORY_SYSTEM );
 }
 
 typedef struct ent_call ent_call;