fix terrain shader invalid colours

[carveJwlIkooP6JGAAIwe30JlM.git] / world_load.c

diff --git a/world_load.c b/world_load.c
index 312d61a09b15d937d7a16d0c800ba70bdf0391ed..5a2861351c7d75956caebbf3bdfbc532f6392fc8 100644 (file)
--- a/world_load.c
+++ b/world_load.c
@@ -1,6 +1,3 @@
-#ifndef WORLD_LOAD_C
-#define WORLD_LOAD_C
-
 #include "world_load.h"
 #include "world_routes.h"
 #include "world_gate.h"
@@ -11,6 +8,8 @@
 #include "network.h"
 #include "player_remote.h"
 #include "vg/vg_loader.h"
+#include "vg/vg_io.h"
+#include <string.h>
 
 /* 
  * load the .mdl file located in path as a world instance
@@ -472,7 +471,6 @@ void world_free( world_instance *world )
    mesh_free( &world->mesh_route_lines );
    mesh_free( &world->mesh_geo );
    mesh_free( &world->mesh_no_collide );
-   mesh_free( &world->mesh_water );
    
    /* glDeleteBuffers silently ignores 0's and names that do not correspond to 
     * existing buffer objects. 
@@ -553,5 +551,3 @@ void world_init_blank( world_instance *world )
    v3_copy( (v3f){1.000f, 0.809f, 0.318f}, state->g_sun_colour );
 #endif
 }
-
-#endif /* WORLD_LOAD_C */