projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
semantics and world reloading
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_gate.h
diff --git
a/world_gate.h
b/world_gate.h
index 469f73695e7da46489e08a2f3b6dc8a93e67b306..b409c51d0d482f65ced1193aa8108a88ea8ecaf3 100644
(file)
--- a/
world_gate.h
+++ b/
world_gate.h
@@
-5,6
+5,7
@@
#ifndef WORLD_GATE_H
#define WORLD_GATE_H
#ifndef WORLD_GATE_H
#define WORLD_GATE_H
+#include "skaterift.h"
#include "common.h"
#include "model.h"
#include "entity.h"
#include "common.h"
#include "model.h"
#include "entity.h"
@@
-229,6
+230,13
@@
VG_STATIC ent_gate *world_intersect_gates( world_instance *world,
gate->type == k_gate_type_nonlocal_unlinked )
continue;
gate->type == k_gate_type_nonlocal_unlinked )
continue;
+ if( gate->type == k_gate_type_nonlocel ){
+ if( skaterift.async_op == k_async_op_world_loading ||
+ skaterift.async_op == k_async_op_world_preloading ){
+ continue;
+ }
+ }
+
if( gate_intersect( gate, pos, last ) ){
return gate;
}
if( gate_intersect( gate, pos, last ) ){
return gate;
}