From 634c2c6acf434f595e32009b581cf4dea40d7e1a Mon Sep 17 00:00:00 2001 From: Adam Olsen Date: Thu, 18 Oct 2001 07:01:40 +0000 Subject: [PATCH] - rename CL_UpdateUserinfo to CL_ParseUpdateUserInfo for uniformness - rework svc_updateuserinfo/CL_ParseUpdateUserInfo like everything else --- qw/include/net_svc.h | 9 +++++++++ qw/source/cl_parse.c | 19 ++++++++++--------- qw/source/net_svc.c | 9 +++++++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/qw/include/net_svc.h b/qw/include/net_svc.h index 237d925ce..1a16926c1 100644 --- a/qw/include/net_svc.h +++ b/qw/include/net_svc.h @@ -40,6 +40,13 @@ typedef struct net_svc_print_s const char *message; } net_svc_print_t; +typedef struct net_svc_updateuserinfo_s +{ + byte slot; + int userid; + const char *userinfo; +} net_svc_updateuserinfo_t; + typedef struct net_svc_download_s { short size; @@ -63,6 +70,8 @@ typedef struct net_svc_modellist_s } net_svc_modellist_t; void NET_SVC_Print_Parse (net_svc_print_t *print, msg_t *message); +void NET_SVC_UpdateUserInfo_Parse (net_svc_updateuserinfo_t *updateuserinfo, + msg_t *message); void NET_SVC_Download_Parse (net_svc_download_t *download, msg_t *message); void NET_SVC_Soundlist_Parse (net_svc_soundlist_t *soundlist, msg_t *message); void NET_SVC_Modellist_Parse (net_svc_modellist_t *modellist, msg_t *message); diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c index 2a0eeae9e..fc9b96331 100644 --- a/qw/source/cl_parse.c +++ b/qw/source/cl_parse.c @@ -997,22 +997,23 @@ CL_ProcessUserInfo (int slot, player_info_t *player) } void -CL_UpdateUserinfo (void) +CL_ParseUpdateUserInfo (void) { - int slot; player_info_t *player; + net_svc_updateuserinfo_t updateuserinfo; - slot = MSG_ReadByte (net_message); - if (slot >= MAX_CLIENTS) + NET_SVC_UpdateUserInfo_Parse (&updateuserinfo, net_message); + + if (updateuserinfo.slot >= MAX_CLIENTS) Host_EndGame ("CL_ParseServerMessage: svc_updateuserinfo > MAX_SCOREBOARD"); - player = &cl.players[slot]; - player->userid = MSG_ReadLong (net_message); - strncpy (player->userinfo, MSG_ReadString (net_message), + player = &cl.players[updateuserinfo.slot]; + player->userid = updateuserinfo.userid; + strncpy (player->userinfo, updateuserinfo.userinfo, sizeof (player->userinfo) - 1); - CL_ProcessUserInfo (slot, player); + CL_ProcessUserInfo (updateuserinfo.slot, player); } void @@ -1345,7 +1346,7 @@ CL_ParseServerMessage (void) break; case svc_updateuserinfo: - CL_UpdateUserinfo (); + CL_ParseUpdateUserInfo (); break; case svc_setinfo: diff --git a/qw/source/net_svc.c b/qw/source/net_svc.c index 021b7392f..c54e05650 100644 --- a/qw/source/net_svc.c +++ b/qw/source/net_svc.c @@ -56,6 +56,15 @@ NET_SVC_Print_Parse (net_svc_print_t *print, msg_t *message) print->message = MSG_ReadString (message); } +void +NET_SVC_UpdateUserInfo_Parse (net_svc_updateuserinfo_t *updateuserinfo, + msg_t *message) +{ + updateuserinfo->slot = MSG_ReadByte (message); + updateuserinfo->userid = MSG_ReadLong (message); + updateuserinfo->userinfo = MSG_ReadString (message); +} + void NET_SVC_Download_Parse (net_svc_download_t *download, msg_t *message) {