mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-02-07 00:11:39 +00:00
- change NET_SVC_*_Parse to return qboolean, indicating if they had a
bad read
This commit is contained in:
parent
d2fe052d59
commit
cf8380b528
2 changed files with 27 additions and 13 deletions
|
@ -76,12 +76,14 @@ typedef struct net_svc_modellist_s
|
||||||
byte nextmodel;
|
byte nextmodel;
|
||||||
} net_svc_modellist_t;
|
} net_svc_modellist_t;
|
||||||
|
|
||||||
void NET_SVC_Print_Parse (net_svc_print_t *print, msg_t *message);
|
qboolean NET_SVC_Print_Parse (net_svc_print_t *print, msg_t *message);
|
||||||
void NET_SVC_UpdateUserInfo_Parse (net_svc_updateuserinfo_t *updateuserinfo,
|
qboolean NET_SVC_UpdateUserInfo_Parse (net_svc_updateuserinfo_t *updateuserinfo,
|
||||||
msg_t *message);
|
msg_t *message);
|
||||||
void NET_SVC_SetInfo_Parse (net_svc_setinfo_t *setinfo, msg_t *message);
|
qboolean NET_SVC_SetInfo_Parse (net_svc_setinfo_t *setinfo, msg_t *message);
|
||||||
void NET_SVC_Download_Parse (net_svc_download_t *download, msg_t *message);
|
qboolean 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);
|
qboolean NET_SVC_Soundlist_Parse (net_svc_soundlist_t *soundlist,
|
||||||
void NET_SVC_Modellist_Parse (net_svc_modellist_t *modellist, msg_t *message);
|
msg_t *message);
|
||||||
|
qboolean NET_SVC_Modellist_Parse (net_svc_modellist_t *modellist,
|
||||||
|
msg_t *message);
|
||||||
|
|
||||||
#endif // NET_SVC_H
|
#endif // NET_SVC_H
|
||||||
|
|
|
@ -49,31 +49,37 @@ static const char rcsid[] =
|
||||||
#include "compat.h"
|
#include "compat.h"
|
||||||
#include "net_svc.h"
|
#include "net_svc.h"
|
||||||
|
|
||||||
void
|
qboolean
|
||||||
NET_SVC_Print_Parse (net_svc_print_t *print, msg_t *message)
|
NET_SVC_Print_Parse (net_svc_print_t *print, msg_t *message)
|
||||||
{
|
{
|
||||||
print->level = MSG_ReadByte (message);
|
print->level = MSG_ReadByte (message);
|
||||||
print->message = MSG_ReadString (message);
|
print->message = MSG_ReadString (message);
|
||||||
|
|
||||||
|
return message->badread;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
qboolean
|
||||||
NET_SVC_UpdateUserInfo_Parse (net_svc_updateuserinfo_t *updateuserinfo,
|
NET_SVC_UpdateUserInfo_Parse (net_svc_updateuserinfo_t *updateuserinfo,
|
||||||
msg_t *message)
|
msg_t *message)
|
||||||
{
|
{
|
||||||
updateuserinfo->slot = MSG_ReadByte (message);
|
updateuserinfo->slot = MSG_ReadByte (message);
|
||||||
updateuserinfo->userid = MSG_ReadLong (message);
|
updateuserinfo->userid = MSG_ReadLong (message);
|
||||||
updateuserinfo->userinfo = MSG_ReadString (message);
|
updateuserinfo->userinfo = MSG_ReadString (message);
|
||||||
|
|
||||||
|
return message->badread;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
qboolean
|
||||||
NET_SVC_SetInfo_Parse (net_svc_setinfo_t *setinfo, msg_t *message)
|
NET_SVC_SetInfo_Parse (net_svc_setinfo_t *setinfo, msg_t *message)
|
||||||
{
|
{
|
||||||
setinfo->slot = MSG_ReadByte (message);
|
setinfo->slot = MSG_ReadByte (message);
|
||||||
setinfo->key = MSG_ReadString (message);
|
setinfo->key = MSG_ReadString (message);
|
||||||
setinfo->value = MSG_ReadString (message);
|
setinfo->value = MSG_ReadString (message);
|
||||||
|
|
||||||
|
return message->badread;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
qboolean
|
||||||
NET_SVC_Download_Parse (net_svc_download_t *download, msg_t *message)
|
NET_SVC_Download_Parse (net_svc_download_t *download, msg_t *message)
|
||||||
{
|
{
|
||||||
download->size = MSG_ReadShort (message);
|
download->size = MSG_ReadShort (message);
|
||||||
|
@ -93,9 +99,11 @@ NET_SVC_Download_Parse (net_svc_download_t *download, msg_t *message)
|
||||||
download->size = 0; // FIXME: CL_ParseDownload doesn't handle this
|
download->size = 0; // FIXME: CL_ParseDownload doesn't handle this
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return message->badread;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
qboolean
|
||||||
NET_SVC_Soundlist_Parse (net_svc_soundlist_t *soundlist, msg_t *message)
|
NET_SVC_Soundlist_Parse (net_svc_soundlist_t *soundlist, msg_t *message)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -111,9 +119,11 @@ NET_SVC_Soundlist_Parse (net_svc_soundlist_t *soundlist, msg_t *message)
|
||||||
soundlist->sounds[MAX_SOUNDS] = "";
|
soundlist->sounds[MAX_SOUNDS] = "";
|
||||||
|
|
||||||
soundlist->nextsound = MSG_ReadByte (message);
|
soundlist->nextsound = MSG_ReadByte (message);
|
||||||
|
|
||||||
|
return message->badread;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
qboolean
|
||||||
NET_SVC_Modellist_Parse (net_svc_modellist_t *modellist, msg_t *message)
|
NET_SVC_Modellist_Parse (net_svc_modellist_t *modellist, msg_t *message)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -129,5 +139,7 @@ NET_SVC_Modellist_Parse (net_svc_modellist_t *modellist, msg_t *message)
|
||||||
modellist->models[MAX_MODELS] = "";
|
modellist->models[MAX_MODELS] = "";
|
||||||
|
|
||||||
modellist->nextmodel = MSG_ReadByte (message);
|
modellist->nextmodel = MSG_ReadByte (message);
|
||||||
|
|
||||||
|
return message->badread;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue