projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of harrygodden.com:/home/carveJwlIkooP6JGAAIwe30JlM
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_load.c
diff --git
a/world_load.c
b/world_load.c
index f196c269450959f960a07a0841ead06193925a40..5ab2dfb0793e80ce9e5670bd0b4e055fbba5ac83 100644
(file)
--- a/
world_load.c
+++ b/
world_load.c
@@
-90,6
+90,7
@@
static void world_instance_load_mdl( u32 instance_id, const char *path ){
world->info.pstr_desc = 0;
world->info.pstr_name = 0;
world->info.timezone = 0.0f;
world->info.pstr_desc = 0;
world->info.pstr_name = 0;
world->info.timezone = 0.0f;
+ world->info.flags = 0;
}
time_t seconds = time(NULL) % ((u32)vg_maxf(1.0f,k_day_length)*60);
}
time_t seconds = time(NULL) % ((u32)vg_maxf(1.0f,k_day_length)*60);
@@
-411,7
+412,7
@@
static void world_free( world_instance *world ){
glDeleteTextures( 1, &world->tex_light_cubes );
/* delete textures and meshes */
glDeleteTextures( 1, &world->tex_light_cubes );
/* delete textures and meshes */
- glDeleteTextures( world->texture_count
, world->textures
);
+ glDeleteTextures( world->texture_count
-1, world->textures+1
);
u32 world_index = world - world_static.instances;
if( world_index ){
u32 world_index = world - world_static.instances;
if( world_index ){