projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change shader properties to be vg_msg based
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_load.c
diff --git
a/world_load.c
b/world_load.c
index 312d61a09b15d937d7a16d0c800ba70bdf0391ed..cf1032ec540a8db0ea935a38c969e02ac086b2d4 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"
#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 "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
/*
* load the .mdl file located in path as a world instance
@@
-553,5
+552,3
@@
void world_init_blank( world_instance *world )
v3_copy( (v3f){1.000f, 0.809f, 0.318f}, state->g_sun_colour );
#endif
}
v3_copy( (v3f){1.000f, 0.809f, 0.318f}, state->g_sun_colour );
#endif
}
-
-#endif /* WORLD_LOAD_C */