add network view for glider

[carveJwlIkooP6JGAAIwe30JlM.git] / player_remote.h

diff --git a/player_remote.h b/player_remote.h
index 9ac3186b7eaf5c69d25a32cf5699e8c913bc3842..2d6200b365c6bbfcc39df8932df95f57ec457bef 100644 (file)
--- a/player_remote.h
+++ b/player_remote.h
@@ -4,6 +4,7 @@
 #include "player.h"
 #include "network.h"
 #include "network_common.h"
+#include "player_effects.h"
 
 #define NETWORK_SFX_QUEUE_LENGTH 12
 
@@ -22,11 +23,20 @@ struct {
       /* TODO: Compression with server code */
       char username[ NETWORK_USERNAME_MAX ];
       char items[k_netmsg_playeritem_max][ADDON_UID_MAX];
+      char chat[ NETWORK_MAX_CHAT ];
+      char region[ NETWORK_REGION_MAX ];
+      u32 region_flags;
+      f64 chat_time;
 
+      /* ui */
       u32 medals[3];
+      f32 opacity;
 
       u32 down_bytes;
       f32 down_kbs;
+      
+      struct player_effects_data effect_data;
+      bool render_glider;
    }
    list[ NETWORK_MAX_PLAYERS ];
 
@@ -37,15 +47,20 @@ struct {
          f64 timestamp;
          enum player_subsystem subsystem;
 
-         u8 instance_id;
+         u8 flags;
          u16 boundary_hash;
 
          union interp_animdata {
-            struct player_skate_animator _skate;
-            struct player_walk_animator _walk;
-            struct player_dead_animator _dead;
+            /* these aren't accessed directly, just used to take the 
+             * max(sizeof) all systems */
+            struct player_skate_animator __skate;
+            struct player_walk_animator __walk;
+            struct player_dead_animator __dead;
+            struct player_basic_info_animator __basic;
          } 
          data;
+
+         struct remote_glider_animator data_glider;
       }
       frames[ NETWORK_BUFFERFRAMES ];
 
@@ -55,12 +70,17 @@ struct {
 
    struct net_sfx sfx_queue[ NETWORK_SFX_QUEUE_LENGTH ];
 
-   m4x3f *final_mtx;
+   m4x3f *final_mtx,
+         *glider_mtx;
    struct player_board_pose board_poses[ NETWORK_MAX_PLAYERS ];
 
    u32 up_bytes;
    f32 up_kbs, down_kbs;
    f64 last_data_measurement;
+
+   int chatting;
+   char chat_buffer[ NETWORK_MAX_CHAT ], chat_message[ NETWORK_MAX_CHAT ];
+   f64 chat_time;
 }
 static netplayers;