moved some stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / world_render.h

diff --git a/world_render.h b/world_render.h
index 32a15baeddd6e0bdf84769f41f2c88b4ec73adc0..9693e814dc9c0c07347fd03883f07905265bdc09 100644 (file)
--- a/world_render.h
+++ b/world_render.h
@@ -202,9 +202,9 @@ static void render_world_gates( m4x4f projection, v3f playerco, m4x3f camera )
    float closest = INFINITY;
    int   id = 0;
 
-   for( int i=0; i<world.routes.gate_count; i++ )
+   for( int i=0; i<world_routes.gate_count; i++ )
    {
-      struct route_gate *rg = &world.routes.gates[i];
+      struct route_gate *rg = &world_routes.gates[i];
       float dist = v3_dist2( rg->gate.co[0], camera[3] );
 
       if( dist < closest )
@@ -214,9 +214,9 @@ static void render_world_gates( m4x4f projection, v3f playerco, m4x3f camera )
       }
    }
 
-   render_gate( &world.routes.gates[id].gate, playerco, camera );
+   render_gate( &world_routes.gates[id].gate, playerco, camera );
    v3_lerp( world.render_gate_pos, 
-            world.routes.gates[id].gate.co[0],
+            world_routes.gates[id].gate.co[0],
             1.0f,
             world.render_gate_pos );
 }
@@ -232,9 +232,9 @@ static void render_world( m4x4f projection, m4x3f camera )
    int closest = 0;
    float min_dist = INFINITY;
 
-   for( int i=0; i<world.routes.route_count; i++ )
+   for( int i=0; i<world_routes.route_count; i++ )
    {
-      float dist = v3_dist2( world.routes.routes[i].scoreboard_transform[3],
+      float dist = v3_dist2( world_routes.routes[i].scoreboard_transform[3],
                               camera[3] );
 
       if( dist < min_dist )
@@ -245,7 +245,7 @@ static void render_world( m4x4f projection, m4x3f camera )
    }
 
    sfd_render( &world.sfd.tester, projection, camera[3], 
-         world.routes.routes[closest].scoreboard_transform );
+         world_routes.routes[closest].scoreboard_transform );
 }
 
 static void render_world_depth( m4x4f projection, m4x3f camera )