qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-29 12:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix more bugs caused by the Hunk_TempAlloc changes and do some more jump

Browse source 
prediction fixes for msg_t and sizebuf_t
This commit is contained in:
Bill Currie 2001-12-03 22:11:21 +00:00
parent 610feb9fc6
commit c130d38c6c
5 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/QF/msg.h
View file

@ -30,10 +30,10 @@
#include "QF/sizebuf.h"
void MSG_WriteChar (sizebuf_t *sb, int c);
void MSG_WriteByte (sizebuf_t *sb, int c);
void MSG_WriteShort (sizebuf_t *sb, int c);
void MSG_WriteLong (sizebuf_t *sb, int c);
void MSG_WriteChar (sizebuf_t *sb, unsigned int c);
void MSG_WriteByte (sizebuf_t *sb, unsigned int c);
void MSG_WriteShort (sizebuf_t *sb, unsigned int c);
void MSG_WriteLong (sizebuf_t *sb, unsigned int c);
void MSG_WriteFloat (sizebuf_t *sb, float f);
void MSG_WriteString (sizebuf_t *sb, const char *s);
void MSG_WriteCoord (sizebuf_t *sb, float f);

1
libs/gamecode/builtins/pr_cmds.c
View file

@ -72,6 +72,7 @@ PF_VarString (progs_t *pr, int first)
for (len = 0, i = first; i < pr->pr_argc; i++)
len += strlen (G_STRING (pr, (OFS_PARM0 + i * 3)));
out = Hunk_TempAlloc (len + 1);
out[0] = 0;
for (i = first; i < pr->pr_argc; i++)
strcat (out, G_STRING (pr, (OFS_PARM0 + i * 3)));
return out;

16
libs/util/msg.c
View file

@ -53,7 +53,7 @@ static const char rcsid[] =
// writing functions
void
MSG_WriteChar (sizebuf_t *sb, int c)
MSG_WriteChar (sizebuf_t *sb, unsigned int c)
{
byte *buf;
@ -62,7 +62,7 @@ MSG_WriteChar (sizebuf_t *sb, int c)
}
void
MSG_WriteByte (sizebuf_t *sb, int c)
MSG_WriteByte (sizebuf_t *sb, unsigned int c)
{
byte *buf;
@ -71,7 +71,7 @@ MSG_WriteByte (sizebuf_t *sb, int c)
}
void
MSG_WriteShort (sizebuf_t *sb, int c)
MSG_WriteShort (sizebuf_t *sb, unsigned int c)
{
byte *buf;
@ -81,7 +81,7 @@ MSG_WriteShort (sizebuf_t *sb, int c)
}
void
MSG_WriteLong (sizebuf_t *sb, int c)
MSG_WriteLong (sizebuf_t *sb, unsigned int c)
{
byte *buf;
@ -97,7 +97,7 @@ MSG_WriteFloat (sizebuf_t *sb, float f)
{
union {
float f;
int l;
unsigned int l;
} dat;
dat.f = f;
@ -118,19 +118,19 @@ MSG_WriteString (sizebuf_t *sb, const char *s)
void
MSG_WriteCoord (sizebuf_t *sb, float f)
{
MSG_WriteShort (sb, (int) (f * 8));
MSG_WriteShort (sb, (unsigned int) (f * 8));
}
void
MSG_WriteAngle (sizebuf_t *sb, float f)
{
MSG_WriteByte (sb, (int) (f * 256 / 360) & 255);
MSG_WriteByte (sb, (unsigned int) (f * 256 / 360) & 255);
}
void
MSG_WriteAngle16 (sizebuf_t *sb, float f)
{
MSG_WriteShort (sb, (int) (f * 65536 / 360) & 65535);
MSG_WriteShort (sb, (unsigned int) (f * 65536 / 360) & 65535);
}

29
libs/util/sizebuf.c
View file

@ -64,23 +64,24 @@ SZ_GetSpace (sizebuf_t *buf, int length)
{
void *data;
if (buf->cursize + length > buf->maxsize) {
if (!buf->allowoverflow)
Sys_Error ("SZ_GetSpace: overflow without allowoverflow set (%d)",
buf->maxsize);
if (length > buf->maxsize)
Sys_Error ("SZ_GetSpace: %i is > full buffer size", length);
Sys_Printf ("SZ_GetSpace: overflow\n");
SZ_Clear (buf);
buf->overflowed = true;
if (buf->cursize + length <= buf->maxsize) {
getspace:
data = buf->data + buf->cursize;
buf->cursize += length;
return data;
}
data = buf->data + buf->cursize;
buf->cursize += length;
if (!buf->allowoverflow)
Sys_Error ("SZ_GetSpace: overflow without allowoverflow set (%d)",
buf->maxsize);
return data;
if (length > buf->maxsize)
Sys_Error ("SZ_GetSpace: %i is > full buffer size", length);
Sys_Printf ("SZ_GetSpace: overflow\n");
SZ_Clear (buf);
buf->overflowed = true;
goto getspace;
}
void

1
qw/source/sv_user.c
View file

@ -725,6 +725,7 @@ SV_BeginDownload_f (void)
while (*name)
*p++ = tolower ((int) *name++);
*p = 0;
name = n;
}