projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server version check
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift.c
diff --git
a/skaterift.c
b/skaterift.c
index 1fec3c720aa42a9032d327387fa76a8f5fb753d3..edbfb23fa3829ab7d4b0a419f44a0306e703935f 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-306,7
+306,9
@@
static void skaterift_change_client_world_preupdate(void);
* ---------------------------------------------------------------------------*/
static void vg_pre_update(void){
* ---------------------------------------------------------------------------*/
static void vg_pre_update(void){
- srinput.enabled = 1;
+ if( !netplayers.chatting ) /* FIXME */
+ srinput.enabled = 1;
+
skaterift_preupdate_inputs();
if( k_tools_mode ) return;
skaterift_preupdate_inputs();
if( k_tools_mode ) return;
@@
-670,10
+672,15
@@
static void vg_gui(void){
remote_player_network_imgui( vg.pv );
remote_player_network_imgui( vg.pv );
- remote_players_imgui_world( world_current_instance(), vg.pv, INFINITY );
if( skaterift.activity == k_skaterift_respawning ){
if( skaterift.activity == k_skaterift_respawning ){
+ remote_players_imgui_world( world_current_instance(), vg.pv,
+ 2000.0f, 0 );
remote_players_imgui_lobby();
}
remote_players_imgui_lobby();
}
+ else {
+ remote_players_chat_imgui(); /* TODO: conditional */
+ remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
+ }
}
}