projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TODO about preupdate call style
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 823b38c70e7992ae838f91b6dd0f55a330feec1e..49d1aaea690849f6fb32bfb3e645901940d9d33d 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-6,6
+6,7
@@
#include "render.h"
#include "network_msg.h"
#include "addon.h"
#include "render.h"
#include "network_msg.h"
#include "addon.h"
+#include "scene.h"
/* types
*/
/* types
*/
@@
-186,7
+187,8
@@
struct world_instance {
ent_miniworld,
ent_prop,
ent_region,
ent_miniworld,
ent_prop,
ent_region,
- ent_glider;
+ ent_glider,
+ ent_npc;
enum skybox {
k_skybox_default,
enum skybox {
k_skybox_default,
@@
-254,6
+256,8
@@
struct world_static {
k_world_loader_load
}
load_state;
k_world_loader_load
}
load_state;
+
+ bool clear_async_op_when_done;
}
extern world_static;
}
extern world_static;