projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collision layers
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift.c
diff --git
a/skaterift.c
b/skaterift.c
index 40be41ef0c7b9d4732b35509f37239987c79d1e4..e639d05eb0deade48ee1cab867f830fe6d903967 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-146,12
+146,14
@@
static void skaterift_restore_state(void){
world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
world_static.active_trigger_volume_count = 0;
localplayer.viewable_world = world_current_instance();
world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
world_static.active_trigger_volume_count = 0;
localplayer.viewable_world = world_current_instance();
+ }
+
+ vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
+ v3f pos;
+ vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
- vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
- v3f pos;
- vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
+ if( v3_length2(pos) > 1.0f )
player__setpos( &localplayer, pos );
player__setpos( &localplayer, pos );
- }
}
}
}
}
@@
-507,10
+509,17
@@
VG_STATIC void render_main_game(void){
/* --------------------------------------------------------------------- */
/* --------------------------------------------------------------------- */
- /* cubemaps TODO: Need a cubemap mark dirty thing for pordals */
world_instance *view_world = localplayer.viewable_world;
if( view_world != NULL ){
render_world_cubemaps( view_world );
world_instance *view_world = localplayer.viewable_world;
if( view_world != NULL ){
render_world_cubemaps( view_world );
+
+ ent_gate *gate = view_world->rendering_gate;
+ if( gate ){
+ if( gate->flags & k_ent_gate_nonlocal ){
+ world_instance *dest = &world_static.instances[ gate->target ];
+ render_world_cubemaps( dest );
+ }
+ }
}
/* variable res target */
}
/* variable res target */