X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_remote.h;h=265409c873933cca4a665002c1bd773a1a44f4bd;hb=74b2136d5b41b18e2eec698f1fd11b503aa1100a;hp=fe72e603f7228741db1008b5673757f899730866;hpb=b35ac7383d4aba1d0b8a74be7bf1695996ff57f4;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_remote.h b/player_remote.h index fe72e60..265409c 100644 --- 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,9 +23,19 @@ 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; } list[ NETWORK_MAX_PLAYERS ]; @@ -39,9 +50,12 @@ struct { 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; } @@ -59,6 +73,10 @@ struct { 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;