reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-02-26 21:41:06 +03:00
Code Issues Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
s1lentq 2024-05-13 18:48:35 +07:00
parent 82a3d1d084
commit a761efa75d
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rehlds/common/quakedef.h
View File

@ -29,6 +29,9 @@
typedef int BOOL; typedef int BOOL;
// The maximum user messages
#define MAX_USERMESSAGES 256
// user message // user message
#define MAX_USER_MSG_DATA 192 #define MAX_USER_MSG_DATA 192

5
rehlds/engine/pr_cmds.cpp
View File

@ -2124,7 +2124,7 @@ void EXT_FUNC PF_MessageBegin_I(int msg_dest, int msg_type, const float *pOrigin
if (msg_type == 0) if (msg_type == 0)
Sys_Error("%s: Tried to create a message with a bogus message type ( 0 )", __func__); Sys_Error("%s: Tried to create a message with a bogus message type ( 0 )", __func__);
gMsgStarted = 1; gMsgStarted = TRUE;
gMsgType = msg_type; gMsgType = msg_type;
gMsgEntity = ed; gMsgEntity = ed;
gMsgDest = msg_dest; gMsgDest = msg_dest;
@ -2151,7 +2151,7 @@ void EXT_FUNC PF_MessageEnd_I(void)
qboolean MsgIsVarLength = 0; qboolean MsgIsVarLength = 0;
if (!gMsgStarted) if (!gMsgStarted)
Sys_Error("%s: called with no active message\n", __func__); Sys_Error("%s: called with no active message\n", __func__);
gMsgStarted = 0; gMsgStarted = FALSE;
if (gMsgEntity && (gMsgEntity->v.flags & FL_FAKECLIENT)) if (gMsgEntity && (gMsgEntity->v.flags & FL_FAKECLIENT))
return; return;
@ -2275,6 +2275,7 @@ void EXT_FUNC PF_WriteByte_I(int iValue)
{ {
if (!gMsgStarted) if (!gMsgStarted)
Sys_Error("%s: called with no active message\n", __func__); Sys_Error("%s: called with no active message\n", __func__);
MSG_WriteByte(&gMsgBuffer, iValue); MSG_WriteByte(&gMsgBuffer, iValue);
} }

8
rehlds/engine/sv_main.cpp
View File

@ -6568,7 +6568,13 @@ void SV_ClearEntities(void)
} }
int EXT_FUNC RegUserMsg(const char *pszName, int iSize) int EXT_FUNC RegUserMsg(const char *pszName, int iSize)
{ {
if (giNextUserMsg > 255 || !pszName || Q_strlen(pszName) > 11 || iSize > 192) if (giNextUserMsg >= MAX_USERMESSAGES)
return 0;
if (iSize > MAX_USER_MSG_DATA)
return 0;
if (!pszName || Q_strlen(pszName) >= MAX_USERMESSAGES_LENGTH - 1)
return 0; return 0;
UserMsg *pUserMsgs = sv_gpUserMsgs; UserMsg *pUserMsgs = sv_gpUserMsgs;

5
rehlds/engine/usermsg.h
View File

@ -31,11 +31,14 @@
#include "maintypes.h" #include "maintypes.h"
#include "quakedef.h" #include "quakedef.h"
// The maximum length of a usermessage name in a network transmission
#define MAX_USERMESSAGES_LENGTH 16
typedef struct _UserMsg typedef struct _UserMsg
{ {
int iMsg; int iMsg;
int iSize; int iSize;
char szName[16]; char szName[MAX_USERMESSAGES_LENGTH];
struct _UserMsg *next; struct _UserMsg *next;
pfnUserMsgHook pfn; pfnUserMsgHook pfn;
} UserMsg; } UserMsg;