SZ_Write (sb, s, strlen(s)+1);
}
+// used by server (always dpprotocol)
+// moved to common.h as #define
/*
-void MSG_WriteCoord (sizebuf_t *sb, float f)
+void MSG_WriteFloatCoord (sizebuf_t *sb, float f)
{
- if (dpprotocol)
- {
- byte *buf;
- int c = (int)f;
- buf = SZ_GetSpace (sb, 3);
- buf[0] = c & 0xff;
- buf[1] = (c >> 8) & 0xff;
- buf[2] = (c >> 16) & 0xff;
- }
- else
- MSG_WriteShort (sb, (int)(f*8));
+ MSG_WriteFloat(sb, f);
}
*/
+// used by client
void MSG_WriteCoord (sizebuf_t *sb, float f)
{
if (dpprotocol)
MSG_WriteFloat(sb, f);
- /*
- {
- int i = (int) (f * 16.0f), j = 0, k, l;
- // 1 sign bit, 5bit exponent, 10bit mantissa with implicit 1
- if (i < 0)
- {
- i = -i;
- j = 0x8000;
- }
-
- // LordHavoc: lets hope the compiler is good, if not it will still perform tolerably
- for (k = 31,l = 0x80000000;!(i & l);k--,l >>= 1);
- j |= k << 10 | ((i >> (k - 10)) & 0x3FF);
-
- MSG_WriteShort(sb, j);
- }
- */
else
- MSG_WriteShort (sb, (int)(f*8));
+ MSG_WriteShort (sb, (int)(f*8.0f + 0.5f));
}
void MSG_WritePreciseAngle (sizebuf_t *sb, float f)
{
- MSG_WriteShort (sb, (int) (f*65536.0f/360) & 65535);
+ MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) + 0.5f) & 65535);
}
+// LordHavoc: round to nearest value, rather than rounding down, fixes crosshair problem
void MSG_WriteAngle (sizebuf_t *sb, float f)
{
- MSG_WriteByte (sb, ((int)f*256/360) & 255);
+ MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) + 0.5f) & 255);
}
//
return string;
}
+// used by server (always dpprotocol)
+// moved to common.h as #define
/*
-float MSG_ReadAbsoluteCoord (void)
+float MSG_ReadFloatCoord (void)
{
- if (dpprotocol)
- {
- int c;
-
- if (msg_readcount+3 > net_message.cursize)
- {
- msg_badread = true;
- return 0;
- }
-
- c = net_message.data[msg_readcount ];
- c |= net_message.data[msg_readcount+1] << 8;
- c |= net_message.data[msg_readcount+2] << 16;
- if (c & 0x800000)
- c |= ~0xFFFFFF; // sign extend
-
- msg_readcount += 3;
-
- return (float) c * (1.0f / 16.0f);
- }
- else
- {
- int c;
-
- if (msg_readcount+2 > net_message.cursize)
- {
- msg_badread = true;
- return 0;
- }
-
- c = (short) (net_message.data[msg_readcount ] |= net_message.data[msg_readcount+1] << 8);
-
- msg_readcount += 2;
-
- return (float) c * (1.0f / 8.0f);
-// return MSG_ReadShort() * (1.0f/8.0f);
- }
+ return MSG_ReadFloat();
}
*/
+// used by client
float MSG_ReadCoord (void)
{
if (dpprotocol)
return MSG_ReadFloat();
- /*
- {
- int c, i;
-
- if (msg_readcount+2 > net_message.cursize)
- {
- msg_badread = true;
- return 0;
- }
-
- c = net_message.data[msg_readcount ] |= net_message.data[msg_readcount+1] << 8;
-
- msg_readcount += 2;
-
- if (!c)
- return 0.0f;
- // 1 sign bit, 5bit exponent, 10bit mantissa with implicit 1
- i = ((c & 0x03FF) | (0x0400)) << (((c & 0x7C00) >> 10) - 10);
- if (c & 0x8000)
- i = -i;
- return i * (1.0f / 16.0f);
- }
- */
else
- {
- int c;
-
- if (msg_readcount+2 > net_message.cursize)
- {
- msg_badread = true;
- return 0;
- }
-
- c = (short) (net_message.data[msg_readcount ] | (net_message.data[msg_readcount+1] << 8));
-
- msg_readcount += 2;
-
- return ((float) c * (1.0f / 8.0f));
-// return MSG_ReadShort() * (1.0f/8.0f);
- }
+ return MSG_ReadShort() * (1.0f/8.0f);
}
/*
{
return MSG_ReadChar() * (360.0f/256.0f);
}
-*/
float MSG_ReadPreciseAngle (void)
{
return MSG_ReadShort() * (360.0f/65536);
}
+*/
//===========================================================================
if (buf->cursize + length > buf->maxsize)
{
if (!buf->allowoverflow)
- Host_Error ("SZ_GetSpace: overflow without allowoverflow set - use -zone on the commandline for more zone memory, default: 512k (quake original default was 48k)");
+ Host_Error ("SZ_GetSpace: overflow without allowoverflow set - use -zone on the commandline for more zone memory, default: 128k (quake original default was 48k)");
if (length > buf->maxsize)
Host_Error ("SZ_GetSpace: %i is > full buffer size", length);
*/
void COM_FileBase (char *in, char *out)
{
- char *s, *s2;
-
- s = in + strlen(in) - 1;
-
- while (s != in && *s != '.')
- s--;
-
- for (s2 = s ; *s2 && *s2 != '/' ; s2--)
- ;
-
- if (s-s2 < 2)
+ char *slash, *dot;
+ char *s;
+
+ slash = in;
+ dot = NULL;
+ s = in;
+ while(*s)
+ {
+ if (*s == '/')
+ slash = s + 1;
+ if (*s == '.')
+ dot = s;
+ s++;
+ }
+ if (dot == NULL)
+ dot = s;
+ if (dot - slash < 2)
strcpy (out,"?model?");
else
{
- s--;
- strncpy (out,s2+1, s-s2);
- out[s-s2] = 0;
+ while (slash < dot)
+ *out++ = *slash++;
+ *out++ = 0;
}
}
}
+unsigned int qmalloctotal_alloc, qmalloctotal_alloccount, qmalloctotal_free, qmalloctotal_freecount;
+
+void *qmalloc(unsigned int size)
+{
+ unsigned int *mem;
+ qmalloctotal_alloc += size;
+ qmalloctotal_alloccount++;
+ mem = malloc(size+sizeof(unsigned int));
+ if (!mem)
+ return mem;
+ *mem = size;
+ return (void *)(mem + 1);
+}
+
+void qfree(void *mem)
+{
+ unsigned int *m;
+ if (!mem)
+ return;
+ m = mem;
+ m--; // back up to size
+ qmalloctotal_free += *m; // size
+ qmalloctotal_freecount++;
+ free(m);
+}
+
+void GL_TextureStats_PrintTotal(void);
+extern int hunk_low_used, hunk_high_used, hunk_size;
+void COM_Memstats_f(void)
+{
+ Con_Printf("%i malloc calls totalling %i bytes (%.4gMB)\n%i free calls totalling %i bytes (%.4gMB)\n%i bytes (%.4gMB) currently allocated\n", qmalloctotal_alloccount, qmalloctotal_alloc, qmalloctotal_alloc / 1048576.0, qmalloctotal_freecount, qmalloctotal_free, qmalloctotal_free / 1048576.0, qmalloctotal_alloc - qmalloctotal_free, (qmalloctotal_alloc - qmalloctotal_free) / 1048576.0);
+ GL_TextureStats_PrintTotal();
+ Con_Printf ("%i bytes (%.4gMB) of %.4gMB hunk in use\n", hunk_low_used + hunk_high_used, (hunk_low_used + hunk_high_used) / 1048576.0, hunk_size / 1048576.0);
+}
+
+
/*
================
COM_Init
Cvar_RegisterVariable (®istered);
Cvar_RegisterVariable (&cmdline);
Cmd_AddCommand ("path", COM_Path_f);
+ Cmd_AddCommand ("memstats", COM_Memstats_f);
COM_InitFilesystem ();
COM_CheckRegistered ();
{
int h;
byte *buf;
- char base[32];
+ char base[1024];
int len;
buf = NULL; // quiet compiler warning
// extract the filename base name for hunk tag
COM_FileBase (path, base);
- if (usehunk == 1)
- buf = Hunk_AllocName (len+1, base);
- else if (usehunk == 2)
- buf = Hunk_TempAlloc (len+1);
- else if (usehunk == 0)
- buf = Z_Malloc (len+1);
- else if (usehunk == 3)
+ switch (usehunk)
+ {
+ case 1:
+ buf = Hunk_AllocName (len+1, va("%s (file)", path));
+ if (!buf)
+ Sys_Error ("COM_LoadFile: not enough hunk space for %s (size %i)", path, len);
+ break;
+// case 0:
+// buf = Z_Malloc (len+1);
+// if (!buf)
+// Sys_Error ("COM_LoadFile: not enough zone space for %s (size %i)", path, len);
+// break;
+ case 3:
buf = Cache_Alloc (loadcache, len+1, base);
- else if (usehunk == 4)
- {
- if (len+1 > loadsize)
- buf = Hunk_TempAlloc (len+1);
- else
- buf = loadbuf;
- }
- else if (usehunk == 5)
- buf = malloc (len+1);
- else
+ if (!buf)
+ Sys_Error ("COM_LoadFile: not enough cache space for %s (size %i)", path, len);
+ break;
+ case 5:
+ buf = qmalloc (len+1);
+ if (!buf)
+ Sys_Error ("COM_LoadFile: not enough available memory for %s (size %i)", path, len);
+ break;
+ default:
Sys_Error ("COM_LoadFile: bad usehunk");
+ break;
+ }
- if (!buf)
- Sys_Error ("COM_LoadFile: not enough space for %s", path);
-
((byte *)buf)[len] = 0;
Sys_FileRead (h, buf, len);
return COM_LoadFile (path, 1, quiet);
}
-byte *COM_LoadTempFile (char *path, qboolean quiet)
-{
- return COM_LoadFile (path, 2, quiet);
-}
-
// LordHavoc: returns malloc'd memory
byte *COM_LoadMallocFile (char *path, qboolean quiet)
{
COM_LoadFile (path, 3, quiet);
}
-// uses temp hunk if larger than bufsize
-byte *COM_LoadStackFile (char *path, void *buffer, int bufsize, qboolean quiet)
-{
- byte *buf;
-
- loadbuf = (byte *)buffer;
- loadsize = bufsize;
- buf = COM_LoadFile (path, 4, quiet);
-
- return buf;
-}
-
/*
=================
COM_LoadPackFile
if (numpackfiles != PAK0_COUNT)
com_modified = true; // not the original file
- newfiles = Hunk_AllocName (numpackfiles * sizeof(packfile_t), "packfile");
+ newfiles = Hunk_AllocName (numpackfiles * sizeof(packfile_t), "pack file-table");
- info = malloc(sizeof(*info)*MAX_FILES_IN_PACK);
+ info = qmalloc(sizeof(*info)*MAX_FILES_IN_PACK);
Sys_FileSeek (packhandle, header.dirofs);
Sys_FileRead (packhandle, (void *)info, header.dirlen);
newfiles[i].filepos = LittleLong(info[i].filepos);
newfiles[i].filelen = LittleLong(info[i].filelen);
}
- free(info);
+ qfree(info);
- pack = Hunk_Alloc (sizeof (pack_t));
+ pack = Hunk_AllocName (sizeof (pack_t), packfile);
strcpy (pack->filename, packfile);
pack->handle = packhandle;
pack->numfiles = numpackfiles;
//
// add the directory to the search path
//
- search = Hunk_Alloc (sizeof(searchpath_t));
+ search = Hunk_AllocName (sizeof(searchpath_t), "pack info");
strcpy (search->filename, dir);
search->next = com_searchpaths;
com_searchpaths = search;
pak = COM_LoadPackFile (pakfile);
if (!pak)
break;
- search = Hunk_Alloc (sizeof(searchpath_t));
+ search = Hunk_AllocName (sizeof(searchpath_t), "pack info");
search->pack = pak;
search->next = com_searchpaths;
- com_searchpaths = search;
+ com_searchpaths = search;
}
//
//
// -path <dir or packfile> [<dir or packfile>] ...
-// Fully specifies the exact serach path, overriding the generated one
+// Fully specifies the exact search path, overriding the generated one
//
i = COM_CheckParm ("-path");
if (i)
if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-')
break;
- search = Hunk_Alloc (sizeof(searchpath_t));
+ search = Hunk_AllocName (sizeof(searchpath_t), "pack info");
if ( !strcmp(COM_FileExtension(com_argv[i]), "pak") )
{
search->pack = COM_LoadPackFile (com_argv[i]);
return false;
}
+
+//======================================
+// LordHavoc: added these because they are useful
+
+void COM_ToLowerString(char *in, char *out)
+{
+ while (*in)
+ {
+ if (*in >= 'A' && *in <= 'Z')
+ *out++ = *in++ + 'a' - 'A';
+ else
+ *out++ = *in++;
+ }
+}
+
+void COM_ToUpperString(char *in, char *out)
+{
+ while (*in)
+ {
+ if (*in >= 'a' && *in <= 'z')
+ *out++ = *in++ + 'A' - 'a';
+ else
+ *out++ = *in++;
+ }
+}
projects / xonotic / darkplaces.git / blobdiff